- Revision
- 213704
- Author
- achristen...@apple.com
- Date
- 2017-03-10 00:36:11 -0800 (Fri, 10 Mar 2017)
Log 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/_javascript_Core:
* 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.
Modified Paths
Diff
Modified: trunk/ChangeLog (213703 => 213704)
--- trunk/ChangeLog 2017-03-10 07:19:04 UTC (rev 213703)
+++ trunk/ChangeLog 2017-03-10 08:36:11 UTC (rev 213704)
@@ -1,3 +1,13 @@
+2017-03-10 Alex Christensen <achristen...@webkit.org>
+
+ 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.
+
2017-03-06 Yusuke Suzuki <utatane....@gmail.com>
Unreviewed, fix AppleWin build
Modified: trunk/Source/_javascript_Core/ChangeLog (213703 => 213704)
--- trunk/Source/_javascript_Core/ChangeLog 2017-03-10 07:19:04 UTC (rev 213703)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-03-10 08:36:11 UTC (rev 213704)
@@ -1,3 +1,18 @@
+2017-03-10 Alex Christensen <achristen...@webkit.org>
+
+ Win64 build fix.
+
+ * 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.
+
2017-03-09 Ryan Haddad <ryanhad...@apple.com>
Unreviewed, rolling out r213695.
Modified: trunk/Source/_javascript_Core/b3/B3FenceValue.h (213703 => 213704)
--- trunk/Source/_javascript_Core/b3/B3FenceValue.h 2017-03-10 07:19:04 UTC (rev 213703)
+++ trunk/Source/_javascript_Core/b3/B3FenceValue.h 2017-03-10 08:36:11 UTC (rev 213704)
@@ -78,9 +78,9 @@
private:
friend class Procedure;
- JS_EXPORT_PRIVATE FenceValue(Origin origin, HeapRange read, HeapRange write);
+ FenceValue(Origin origin, HeapRange read, HeapRange write);
- JS_EXPORT_PRIVATE FenceValue(Origin origin);
+ FenceValue(Origin origin);
};
} } // namespace JSC::B3
Modified: trunk/Source/_javascript_Core/b3/B3Value.h (213703 => 213704)
--- trunk/Source/_javascript_Core/b3/B3Value.h 2017-03-10 07:19:04 UTC (rev 213703)
+++ trunk/Source/_javascript_Core/b3/B3Value.h 2017-03-10 08:36:11 UTC (rev 213704)
@@ -476,7 +476,7 @@
Origin m_origin;
AdjacencyList m_children;
- JS_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH static void badKind(Kind, unsigned);
+ NO_RETURN_DUE_TO_CRASH static void badKind(Kind, unsigned);
public:
BasicBlock* owner { nullptr }; // computed by Procedure::resetValueOwners().
Modified: trunk/Source/_javascript_Core/b3/air/opcode_generator.rb (213703 => 213704)
--- trunk/Source/_javascript_Core/b3/air/opcode_generator.rb 2017-03-10 07:19:04 UTC (rev 213703)
+++ trunk/Source/_javascript_Core/b3/air/opcode_generator.rb 2017-03-10 08:36:11 UTC (rev 213704)
@@ -548,7 +548,7 @@
outp.puts "switch (#{inst}->kind.opcode) {"
$opcodes.values.each {
| opcode |
- outp.puts "case #{opcode.name}:"
+ outp.puts "case Opcode::#{opcode.name}:"
if opcode.custom
yield opcode, nil
else
@@ -668,7 +668,7 @@
outp.puts "switch (opcode) {"
$opcodes.values.each {
| opcode |
- outp.puts "case #{opcode.name}:"
+ outp.puts "case Opcode::#{opcode.name}:"
if opcode.custom
outp.puts "OPGEN_RETURN(#{opcode.name}Custom::isValidFormStatic(arguments...));"
else
@@ -721,7 +721,7 @@
$opcodes.values.each {
| opcode |
if opcode.attributes[:terminal]
- outp.puts "case #{opcode.name}:"
+ outp.puts "case Opcode::#{opcode.name}:"
didFindTerminals = true
end
}
@@ -740,7 +740,7 @@
$opcodes.values.each {
| opcode |
if opcode.attributes[:return]
- outp.puts "case #{opcode.name}:"
+ outp.puts "case Opcode::#{opcode.name}:"
didFindReturns = true
end
}
@@ -766,7 +766,7 @@
outp.puts " switch (opcode) {"
$opcodes.keys.each {
| opcode |
- outp.puts " case #{opcode}:"
+ outp.puts " case Opcode::#{opcode}:"
outp.puts " out.print(\"#{opcode}\");"
outp.puts " return;"
}
@@ -839,7 +839,7 @@
outp.puts "switch (kind.opcode) {"
$opcodes.values.each {
| opcode |
- outp.puts "case #{opcode.name}:"
+ outp.puts "case Opcode::#{opcode.name}:"
if opcode.custom
outp.puts "OPGEN_RETURN(#{opcode.name}Custom::admitsStack(*this, argIndex));"
@@ -983,7 +983,7 @@
$opcodes.values.each {
| opcode |
if opcode.attributes[:terminal]
- outp.puts "case #{opcode.name}:"
+ outp.puts "case Opcode::#{opcode.name}:"
foundTrue = true
end
}
@@ -993,7 +993,7 @@
$opcodes.values.each {
| opcode |
if opcode.custom
- outp.puts "case #{opcode.name}:"
+ outp.puts "case Opcode::#{opcode.name}:"
outp.puts "return #{opcode.name}Custom::isTerminal(*this);"
end
}
@@ -1011,7 +1011,7 @@
$opcodes.values.each {
| opcode |
if opcode.attributes[:effects]
- outp.puts "case #{opcode.name}:"
+ outp.puts "case Opcode::#{opcode.name}:"
foundTrue = true
end
}
@@ -1021,7 +1021,7 @@
$opcodes.values.each {
| opcode |
if opcode.custom
- outp.puts "case #{opcode.name}:"
+ outp.puts "case Opcode::#{opcode.name}:"
outp.puts "return #{opcode.name}Custom::hasNonArgNonControlEffects(*this);"
end
}
@@ -1039,7 +1039,7 @@
$opcodes.values.each {
| opcode |
if opcode.attributes[:terminal] or opcode.attributes[:effects]
- outp.puts "case #{opcode.name}:"
+ outp.puts "case Opcode::#{opcode.name}:"
foundTrue = true
end
}
@@ -1049,7 +1049,7 @@
$opcodes.values.each {
| opcode |
if opcode.custom
- outp.puts "case #{opcode.name}:"
+ outp.puts "case Opcode::#{opcode.name}:"
outp.puts "return #{opcode.name}Custom::hasNonArgEffects(*this);"
end
}
@@ -1137,7 +1137,7 @@
outp.puts "switch (inst.opcode) {"
$opcodes.values.each {
| opcode |
- outp.puts "case #{opcode.name}:"
+ outp.puts "case Opcode::#{opcode.name}:"
if opcode.custom
outp.puts "#{opcode.name}Custom.forEachArg(inst, func);"
else
@@ -1193,7 +1193,7 @@
$opcodes.values.each {
| opcode |
if opcode.attributes[:terminal] or opcode.attributes[:effects]
- outp.puts "case #{opcode.name}:"
+ outp.puts "case Opcode::#{opcode.name}:"
foundTrue = true
end
}
@@ -1203,7 +1203,7 @@
$opcodes.values.each {
| opcode |
if opcode.custom
- outp.puts "case #{opcode.name}:"
+ outp.puts "case Opcode::#{opcode.name}:"
outp.puts "return #{opcode.name}Custom.hasNonArgNonControlEffects(inst);"
end
}
@@ -1217,7 +1217,7 @@
outp.puts "switch (opcode) {"
$opcodes.keys.sort.each_with_index {
| opcode, index |
- outp.puts "case #{opcode}:"
+ outp.puts "case Opcode::#{opcode}:"
outp.puts "return #{index}"
}
outp.puts "default:"
Modified: trunk/Source/cmake/OptionsWin.cmake (213703 => 213704)
--- trunk/Source/cmake/OptionsWin.cmake 2017-03-10 07:19:04 UTC (rev 213703)
+++ trunk/Source/cmake/OptionsWin.cmake 2017-03-10 08:36:11 UTC (rev 213704)
@@ -54,6 +54,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIEW_MODE_CSS_MEDIA PUBLIC ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBASSEMBLY PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_ANIMATIONS PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PUBLIC OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_SOCKETS PUBLIC ON)
