Bug 99683 – JavaScriptCore uses PLATFORM(MAC) when it means OS(DARWIN)

• Status: RESOLVED
• Resolution: FIXED
• Component: JavaScriptCore

[Jeremy Huddleston Sequoia]

Source/JavaScriptCore/heap/VTableSpectrum.cpp uses PLATFORM(MAC) for some dladdr-foo, but that is valid based on OS(DARWIN) rather than PLATFORM(MAC) ... ie, it's valid for darwin/qt, darwin/gtk, etc.

[Jeremy Huddleston Sequoia]

It looks like the same mis-use is occurring in:

Source/JavaScriptCore/jit/ThunkGenerators.cpp
Source/JavaScriptCore/tools/CodeProfile.cpp

[Alberto Garcia]

(In reply to comment #0)
> Source/JavaScriptCore/heap/VTableSpectrum.cpp uses PLATFORM(MAC) for
> some dladdr-foo, but that is valid based on OS(DARWIN) rather than
> PLATFORM(MAC) ... ie, it's valid for darwin/qt, darwin/gtk, etc.

That file does not exist anymore, I would propose to close this bug
but you mention other files that might be affected by the same
problem.

Is this still relevant? Are there other files to take care of?

[Jeremy Huddleston Sequoia]

(In reply to comment #2)
> (In reply to comment #0)
> > Source/JavaScriptCore/heap/VTableSpectrum.cpp uses PLATFORM(MAC) for
> > some dladdr-foo, but that is valid based on OS(DARWIN) rather than
> > PLATFORM(MAC) ... ie, it's valid for darwin/qt, darwin/gtk, etc.
> 
> That file does not exist anymore, I would propose to close this bug
> but you mention other files that might be affected by the same
> problem.
> 
> Is this still relevant? Are there other files to take care of?

It still exists in the latest released version of webkit-gtk (2.2.3).  I'll try updating our Portfile to use 2.3.x to see if anything else falls out with that beta release.

As of 2.2.3, we still needed to do the following changes:

    # https://bugs.webkit.org/show_bug.cgi?id=99683
    reinplace "s:PLATFORM(MAC):OS(DARWIN):g" \
        ${worksrcpath}/Source/JavaScriptCore/heap/VTableSpectrum.cpp \
        ${worksrcpath}/Source/JavaScriptCore/jit/ThunkGenerators.cpp \
        ${worksrcpath}/Source/JavaScriptCore/tools/CodeProfile.cpp

    # https://bugs.webkit.org/show_bug.cgi?id=58737
    reinplace "s:OS(MAC_OS_X):PLATFORM(MAC):" \
        ${worksrcpath}/Source/WTF/wtf/ThreadingPthreads.cpp

[Alberto Garcia]

Created attachment 221336 [details]
Patch

(In reply to comment #3)
> As of 2.2.3, we still needed to do the following changes:
>
>     # https://bugs.webkit.org/show_bug.cgi?id=99683
>     reinplace "s:PLATFORM(MAC):OS(DARWIN):g" \
>         ${worksrcpath}/Source/JavaScriptCore/heap/VTableSpectrum.cpp \
>         ${worksrcpath}/Source/JavaScriptCore/jit/ThunkGenerators.cpp \
>         ${worksrcpath}/Source/JavaScriptCore/tools/CodeProfile.cpp

VTableSpectrum.cpp no longer exists, but else it's fine.

Here's the updated patch.

[Alberto Garcia]

Committed r162266: <http://trac.webkit.org/changeset/162266>