Changeset 103647 in webkit


Ignore:
Timestamp:
Dec 23, 2011 8:35:22 PM (12 years ago)
Author:
mitz@apple.com
Message:

Print dlerror() when dyld functions fail unexpectedly
​https://bugs.webkit.org/show_bug.cgi?id=75185

Reviewed by Sam Weinig.

  • platform/mac/SoftLinking.h:
Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r103643 r103647  
     12011-12-23  Dan Bernstein  <mitz@apple.com>
     2
     3        Print dlerror() when dyld functions fail unexpectedly
     4        https://bugs.webkit.org/show_bug.cgi?id=75185
     5
     6        Reviewed by Sam Weinig.
     7
     8        * platform/mac/SoftLinking.h:
     9
    1102011-12-23  Sam Weinig  <sam@webkit.org>
    211

  • trunk/Source/WebCore/platform/mac/SoftLinking.h

    r89748 r103647  
    3434    { \
    3535        static void* dylib = dlopen("/usr/lib/" #lib ".dylib", RTLD_NOW); \
    36         ASSERT(dylib); \
     36        ASSERT_WITH_MESSAGE(dylib, "%s", dlerror()); \
    3737        return dylib; \
    3838    }
    … …  
    4242    { \
    4343        static void* frameworkLibrary = dlopen("/System/Library/Frameworks/" #framework ".framework/" #framework, RTLD_NOW); \
    44         ASSERT(frameworkLibrary); \
     44        ASSERT_WITH_MESSAGE(frameworkLibrary, "%s", dlerror()); \
    4545        return frameworkLibrary; \
    4646    }
    … …  
    5757    { \
    5858        static void* frameworkLibrary = dlopen("/System/Library/Frameworks/CoreServices.framework/Frameworks/" #framework ".framework/" #framework, RTLD_NOW); \
    59         ASSERT(frameworkLibrary); \
     59        ASSERT_WITH_MESSAGE(frameworkLibrary, "%s", dlerror()); \
    6060        return frameworkLibrary; \
    6161    }
    … …  
    6868    { \
    6969        softLink##functionName = (resultType (*) parameterDeclarations) dlsym(framework##Library(), #functionName); \
    70         ASSERT(softLink##functionName); \
     70        ASSERT_WITH_MESSAGE(softLink##functionName, "%s", dlerror()); \
    7171        return softLink##functionName parameterNames; \
    7272    }\
    … …  
    119119    { \
    120120        void** pointer = static_cast<void**>(dlsym(framework##Library(), #name)); \
    121         ASSERT(pointer); \
     121        ASSERT_WITH_MESSAGE(pointer, "%s", dlerror()); \
    122122        pointer##name = static_cast<type>(*pointer); \
    123123        get##name = name##Function; \
    … …  
    157157    { \
    158158        void* constant = dlsym(framework##Library(), #name); \
    159         ASSERT(constant); \
     159        ASSERT_WITH_MESSAGE(constant, "%s", dlerror()); \
    160160        constant##name = *static_cast<type*>(constant); \
    161161        get##name = name##Function; \
Note: See TracChangeset for help on using the changeset viewer.