<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>99683</bug_id>
          
          <creation_ts>2012-10-17 22:27:45 -0700</creation_ts>
          <short_desc>JavaScriptCore uses PLATFORM(MAC) when it means OS(DARWIN)</short_desc>
          <delta_ts>2014-01-18 11:37:48 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>JavaScriptCore</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>126492</blocked>
          <everconfirmed>0</everconfirmed>
          <reporter name="Jeremy Huddleston Sequoia">jeremyhu</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>barraclough</cc>
    
    <cc>berto</cc>
    
    <cc>cgarcia</cc>
    
    <cc>ggaren</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>744985</commentid>
    <comment_count>0</comment_count>
    <who name="Jeremy Huddleston Sequoia">jeremyhu</who>
    <bug_when>2012-10-17 22:27:45 -0700</bug_when>
    <thetext>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&apos;s valid for darwin/qt, darwin/gtk, etc.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>744987</commentid>
    <comment_count>1</comment_count>
    <who name="Jeremy Huddleston Sequoia">jeremyhu</who>
    <bug_when>2012-10-17 22:31:11 -0700</bug_when>
    <thetext>It looks like the same mis-use is occurring in:

Source/JavaScriptCore/jit/ThunkGenerators.cpp
Source/JavaScriptCore/tools/CodeProfile.cpp</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>964105</commentid>
    <comment_count>2</comment_count>
    <who name="Alberto Garcia">berto</who>
    <bug_when>2014-01-03 08:24:11 -0800</bug_when>
    <thetext>(In reply to comment #0)
&gt; Source/JavaScriptCore/heap/VTableSpectrum.cpp uses PLATFORM(MAC) for
&gt; some dladdr-foo, but that is valid based on OS(DARWIN) rather than
&gt; PLATFORM(MAC) ... ie, it&apos;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?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>964111</commentid>
    <comment_count>3</comment_count>
    <who name="Jeremy Huddleston Sequoia">jeremyhu</who>
    <bug_when>2014-01-03 08:42:59 -0800</bug_when>
    <thetext>(In reply to comment #2)
&gt; (In reply to comment #0)
&gt; &gt; Source/JavaScriptCore/heap/VTableSpectrum.cpp uses PLATFORM(MAC) for
&gt; &gt; some dladdr-foo, but that is valid based on OS(DARWIN) rather than
&gt; &gt; PLATFORM(MAC) ... ie, it&apos;s valid for darwin/qt, darwin/gtk, etc.
&gt; 
&gt; That file does not exist anymore, I would propose to close this bug
&gt; but you mention other files that might be affected by the same
&gt; problem.
&gt; 
&gt; 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&apos;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 &quot;s:PLATFORM(MAC):OS(DARWIN):g&quot; \
        ${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 &quot;s:OS(MAC_OS_X):PLATFORM(MAC):&quot; \
        ${worksrcpath}/Source/WTF/wtf/ThreadingPthreads.cpp</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>968618</commentid>
    <comment_count>4</comment_count>
      <attachid>221336</attachid>
    <who name="Alberto Garcia">berto</who>
    <bug_when>2014-01-15 22:59:00 -0800</bug_when>
    <thetext>Created attachment 221336
Patch

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

VTableSpectrum.cpp no longer exists, but else it&apos;s fine.

Here&apos;s the updated patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>969487</commentid>
    <comment_count>5</comment_count>
    <who name="Alberto Garcia">berto</who>
    <bug_when>2014-01-18 11:37:48 -0800</bug_when>
    <thetext>Committed r162266: &lt;http://trac.webkit.org/changeset/162266&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>221336</attachid>
            <date>2014-01-15 22:59:00 -0800</date>
            <delta_ts>2014-01-18 11:21:32 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>99683.diff</filename>
            <type>text/plain</type>
            <size>2581</size>
            <attacher name="Alberto Garcia">berto</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2
YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDJiMjA1ZTMuLmExODNhMDEgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD
b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTAxLTE1ICBBbGJlcnRvIEdhcmNp
YSAgPGJlcnRvQGlnYWxpYS5jb20+CisKKyAgICAgICAgSmF2YVNjcmlwdENvcmUgdXNlcyBQTEFU
Rk9STShNQUMpIHdoZW4gaXQgbWVhbnMgT1MoREFSV0lOKQorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTk2ODMKKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGppdC9UaHVua0dlbmVyYXRvcnMuY3BwOgorICAg
ICAgICAqIHRvb2xzL0NvZGVQcm9maWxlLmNwcDoKKyAgICAgICAgKEpTQzo6c3ltYm9sTmFtZSk6
CisgICAgICAgIChKU0M6OkNvZGVQcm9maWxlOjpzYW1wbGUpOgorCiAyMDE0LTAxLTE1ICBKb3Nl
cGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gQ2xlYW4g
dXAgUkVNT1RFX0lOU1BFQ1RPUiBjb2RlIGluIE9wZW5Tb3VyY2UgYWZ0ZXIgdGhlIGlPUyBtZXJn
ZQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9UaHVua0dlbmVyYXRvcnMu
Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9UaHVua0dlbmVyYXRvcnMuY3BwCmluZGV4
IDVhMjk0MzIuLjExODc1Y2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQv
VGh1bmtHZW5lcmF0b3JzLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1RodW5r
R2VuZXJhdG9ycy5jcHAKQEAgLTYwMyw3ICs2MDMsNyBAQCBkb3VibGUganNSb3VuZChkb3VibGUg
ZCkKIAogfQogCi0jaWYgQ1BVKFg4Nl82NCkgJiYgQ09NUElMRVIoR0NDKSAmJiAoUExBVEZPUk0o
TUFDKSB8fCBPUyhMSU5VWCkpCisjaWYgQ1BVKFg4Nl82NCkgJiYgQ09NUElMRVIoR0NDKSAmJiAo
T1MoREFSV0lOKSB8fCBPUyhMSU5VWCkpCiAKICNkZWZpbmUgZGVmaW5lVW5hcnlEb3VibGVPcFdy
YXBwZXIoZnVuY3Rpb24pIFwKICAgICBhc20oIFwKQEAgLTYxOSw3ICs2MTksNyBAQCBkb3VibGUg
anNSb3VuZChkb3VibGUgZCkKICAgICB9IFwKICAgICBzdGF0aWMgTWF0aFRodW5rIFVuYXJ5RG91
YmxlT3BXcmFwcGVyKGZ1bmN0aW9uKSA9ICZmdW5jdGlvbiMjVGh1bms7CiAKLSNlbGlmIENQVShY
ODYpICYmIENPTVBJTEVSKEdDQykgJiYgKFBMQVRGT1JNKE1BQykgfHwgT1MoTElOVVgpKQorI2Vs
aWYgQ1BVKFg4NikgJiYgQ09NUElMRVIoR0NDKSAmJiAoT1MoREFSV0lOKSB8fCBPUyhMSU5VWCkp
CiAjZGVmaW5lIGRlZmluZVVuYXJ5RG91YmxlT3BXcmFwcGVyKGZ1bmN0aW9uKSBcCiAgICAgYXNt
KCBcCiAgICAgICAgICIudGV4dFxuIiBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvdG9vbHMvQ29kZVByb2ZpbGUuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rvb2xzL0Nv
ZGVQcm9maWxlLmNwcAppbmRleCA1OTllZmZhLi5iOTlkZjJjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
SmF2YVNjcmlwdENvcmUvdG9vbHMvQ29kZVByb2ZpbGUuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny
aXB0Q29yZS90b29scy9Db2RlUHJvZmlsZS5jcHAKQEAgLTMzLDcgKzMzLDcgQEAKICNpbmNsdWRl
IDx3dGYvVmVjdG9yLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKLSNpZiBQ
TEFURk9STShNQUMpCisjaWYgT1MoREFSV0lOKQogI2luY2x1ZGUgPGN4eGFiaS5oPgogI2luY2x1
ZGUgPGRsZmNuLmg+CiAjaW5jbHVkZSA8ZXhlY2luZm8uaD4KQEAgLTU2LDcgKzU2LDcgQEAgY29u
c3QgY2hhciogQ29kZVByb2ZpbGU6OnNfY29kZVR5cGVOYW1lc1tDb2RlUHJvZmlsZTo6TnVtYmVy
T2ZDb2RlVHlwZXNdID0gewogLy8gSGVscGVyIGZ1bmN0aW9uLCBmaW5kIHRoZSBzeW1ib2wgbmFt
ZSBmb3IgYSBwYyBpbiBKU0MuCiBzdGF0aWMgY29uc3QgY2hhciogc3ltYm9sTmFtZSh2b2lkKiBh
ZGRyZXNzKQogewotI2lmIFBMQVRGT1JNKE1BQykKKyNpZiBPUyhEQVJXSU4pCiAgICAgRGxfaW5m
byBpbmZvOwogICAgIGlmICghZGxhZGRyKGFkZHJlc3MsICZpbmZvKSB8fCAhaW5mby5kbGlfc25h
bWUpCiAgICAgICAgIHJldHVybiAiPHVua25vd24+IjsKQEAgLTEyMyw3ICsxMjMsNyBAQCB2b2lk
IENvZGVQcm9maWxlOjpzYW1wbGUodm9pZCogcGMsIHZvaWQqKiBmcmFtZVBvaW50ZXIpCiAgICAg
ICAgIGlmICh0eXBlICE9IEVuZ2luZUZyYW1lKQogICAgICAgICAgICAgcmV0dXJuOwogCi0jaWYg
UExBVEZPUk0oTUFDKSAmJiBDUFUoWDg2XzY0KQorI2lmIE9TKERBUldJTikgJiYgQ1BVKFg4Nl82
NCkKICAgICAgICAgLy8gV2FsayB1cCB0aGUgc3RhY2suCiAgICAgICAgIHBjID0gZnJhbWVQb2lu
dGVyWzFdOwogICAgICAgICBmcmFtZVBvaW50ZXIgPSByZWludGVycHJldF9jYXN0PHZvaWQqKj4o
KmZyYW1lUG9pbnRlcik7Cg==
</data>
<flag name="review"
          id="245230"
          type_id="1"
          status="+"
          setter="andersca"
    />
          </attachment>
      

    </bug>

</bugzilla>