Changeset 213704 in webkit


Ignore:
Timestamp:
Mar 10, 2017 12:36:11 AM (7 years ago)
Author:
achristensen@apple.com
Message:

Win64 build fix.

.:

  • Source/cmake/OptionsWin.cmake:

WASM got turned on on Win64. Judging by the state of WasmMemory.cpp, I'm going to
assume this was a mistake and turn it off until someone writes a version that uses
VirtualAlloc/VirtualFree instead of mmap.
The FTL seems a bit unstable, though. This fixes the build, but more fixes are necessary.

Source/JavaScriptCore:

  • b3/B3FenceValue.h:
  • b3/B3Value.h:

Putting JS_EXPORT_PRIVATE on member functions in classes that are declared with JS_EXPORT_PRIVATE
doesn't accomplish anything except making Visual Studio mad.

  • b3/air/opcode_generator.rb:

winnt.h has naming collisions with enum values from AirOpcode.h.
For example, MemoryFence is #defined to be _mm_mfence, which is declared to be a function in emmintrin.h.
RotateLeft32 is #defined to be _rotl, which is declared to be a function in <stdlib.h>
A clean solution is just to put Opcode:: before the references to the opcode names to tell Visual Studio
that it is referring to the enum value in AirOpcode.h and not the function declaration elsewhere.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r213451 r213704  
     12017-03-10  Alex Christensen  <achristensen@webkit.org>
     2
     3        Win64 build fix.
     4
     5        * Source/cmake/OptionsWin.cmake:
     6        WASM got turned on on Win64.  Judging by the state of WasmMemory.cpp, I'm going to
     7        assume this was a mistake and turn it off until someone writes a version that uses
     8        VirtualAlloc/VirtualFree instead of mmap.
     9        The FTL seems a bit unstable, though.  This fixes the build, but more fixes are necessary.
     10
    1112017-03-06  Yusuke Suzuki  <utatane.tea@gmail.com>
    212

  • trunk/Source/JavaScriptCore/ChangeLog

    r213702 r213704  
     12017-03-10  Alex Christensen  <achristensen@webkit.org>
     2
     3        Win64 build fix.
     4
     5        * b3/B3FenceValue.h:
     6        * b3/B3Value.h:
     7        Putting JS_EXPORT_PRIVATE on member functions in classes that are declared with JS_EXPORT_PRIVATE
     8        doesn't accomplish anything except making Visual Studio mad.
     9        * b3/air/opcode_generator.rb:
     10        winnt.h has naming collisions with enum values from AirOpcode.h.
     11        For example, MemoryFence is #defined to be _mm_mfence, which is declared to be a function in emmintrin.h.
     12        RotateLeft32 is #defined to be _rotl, which is declared to be a function in <stdlib.h>
     13        A clean solution is just to put Opcode:: before the references to the opcode names to tell Visual Studio
     14        that it is referring to the enum value in AirOpcode.h and not the function declaration elsewhere.
     15
    1162017-03-09  Ryan Haddad  <ryanhaddad@apple.com>
    217

  • trunk/Source/JavaScriptCore/b3/B3FenceValue.h

    r206595 r213704  
    7979    friend class Procedure;
    8080   
    81     JS_EXPORT_PRIVATE FenceValue(Origin origin, HeapRange read, HeapRange write);
     81    FenceValue(Origin origin, HeapRange read, HeapRange write);
    8282   
    83     JS_EXPORT_PRIVATE FenceValue(Origin origin);
     83    FenceValue(Origin origin);
    8484};
    8585

  • trunk/Source/JavaScriptCore/b3/B3Value.h

    r212970 r213704  
    477477    AdjacencyList m_children;
    478478
    479     JS_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH static void badKind(Kind, unsigned);
     479    NO_RETURN_DUE_TO_CRASH static void badKind(Kind, unsigned);
    480480
    481481public:

  • trunk/Source/JavaScriptCore/b3/air/opcode_generator.rb

    r212970 r213704  
    549549    $opcodes.values.each {
    550550        | opcode |
    551         outp.puts "case #{opcode.name}:"
     551        outp.puts "case Opcode::#{opcode.name}:"
    552552        if opcode.custom
    553553            yield opcode, nil
    … …  
    669669    $opcodes.values.each {
    670670        | opcode |
    671         outp.puts "case #{opcode.name}:"
     671        outp.puts "case Opcode::#{opcode.name}:"
    672672        if opcode.custom
    673673            outp.puts "OPGEN_RETURN(#{opcode.name}Custom::isValidFormStatic(arguments...));"
    … …  
    722722        | opcode |
    723723        if opcode.attributes[:terminal]
    724             outp.puts "case #{opcode.name}:"
     724            outp.puts "case Opcode::#{opcode.name}:"
    725725            didFindTerminals = true
    726726        end
    … …  
    741741        | opcode |
    742742        if opcode.attributes[:return]
    743             outp.puts "case #{opcode.name}:"
     743            outp.puts "case Opcode::#{opcode.name}:"
    744744            didFindReturns = true
    745745        end
    … …  
    767767    $opcodes.keys.each {
    768768        | opcode |
    769         outp.puts "    case #{opcode}:"
     769        outp.puts "    case Opcode::#{opcode}:"
    770770        outp.puts "        out.print(\"#{opcode}\");"
    771771        outp.puts "        return;"
    … …  
    840840    $opcodes.values.each {
    841841        | opcode |
    842         outp.puts "case #{opcode.name}:"
     842        outp.puts "case Opcode::#{opcode.name}:"
    843843
    844844        if opcode.custom
    … …  
    984984        | opcode |
    985985        if opcode.attributes[:terminal]
    986             outp.puts "case #{opcode.name}:"
     986            outp.puts "case Opcode::#{opcode.name}:"
    987987            foundTrue = true
    988988        end
    … …  
    994994        | opcode |
    995995        if opcode.custom
    996             outp.puts "case #{opcode.name}:"
     996            outp.puts "case Opcode::#{opcode.name}:"
    997997            outp.puts "return #{opcode.name}Custom::isTerminal(*this);"
    998998        end
    … …  
    10121012        | opcode |
    10131013        if opcode.attributes[:effects]
    1014             outp.puts "case #{opcode.name}:"
     1014            outp.puts "case Opcode::#{opcode.name}:"
    10151015            foundTrue = true
    10161016        end
    … …  
    10221022        | opcode |
    10231023        if opcode.custom
    1024             outp.puts "case #{opcode.name}:"
     1024            outp.puts "case Opcode::#{opcode.name}:"
    10251025            outp.puts "return #{opcode.name}Custom::hasNonArgNonControlEffects(*this);"
    10261026        end
    … …  
    10401040        | opcode |
    10411041        if opcode.attributes[:terminal] or opcode.attributes[:effects]
    1042             outp.puts "case #{opcode.name}:"
     1042            outp.puts "case Opcode::#{opcode.name}:"
    10431043            foundTrue = true
    10441044        end
    … …  
    10501050        | opcode |
    10511051        if opcode.custom
    1052             outp.puts "case #{opcode.name}:"
     1052            outp.puts "case Opcode::#{opcode.name}:"
    10531053            outp.puts "return #{opcode.name}Custom::hasNonArgEffects(*this);"
    10541054        end
    … …  
    11381138    $opcodes.values.each {
    11391139        | opcode |
    1140         outp.puts "case #{opcode.name}:"
     1140        outp.puts "case Opcode::#{opcode.name}:"
    11411141        if opcode.custom
    11421142            outp.puts "#{opcode.name}Custom.forEachArg(inst, func);"
    … …  
    11941194        | opcode |
    11951195        if opcode.attributes[:terminal] or opcode.attributes[:effects]
    1196             outp.puts "case #{opcode.name}:"
     1196            outp.puts "case Opcode::#{opcode.name}:"
    11971197            foundTrue = true
    11981198        end
    … …  
    12041204        | opcode |
    12051205        if opcode.custom
    1206             outp.puts "case #{opcode.name}:"
     1206            outp.puts "case Opcode::#{opcode.name}:"
    12071207            outp.puts "return #{opcode.name}Custom.hasNonArgNonControlEffects(inst);"
    12081208        end
    … …  
    12181218    $opcodes.keys.sort.each_with_index {
    12191219        | opcode, index |
    1220         outp.puts "case #{opcode}:"
     1220        outp.puts "case Opcode::#{opcode}:"
    12211221        outp.puts "return #{index}"
    12221222    }

  • trunk/Source/cmake/OptionsWin.cmake

    r212629 r213704  
    5555WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK PUBLIC ON)
    5656WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIEW_MODE_CSS_MEDIA PUBLIC ON)
     57WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBASSEMBLY PRIVATE OFF)
    5758WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_ANIMATIONS PUBLIC ON)
    5859WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PUBLIC OFF)
Note: See TracChangeset for help on using the changeset viewer.