<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213704] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213704">213704</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2017-03-10 00:36:11 -0800 (Fri, 10 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3FenceValueh">trunk/Source/JavaScriptCore/b3/B3FenceValue.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Valueh">trunk/Source/JavaScriptCore/b3/B3Value.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airopcode_generatorrb">trunk/Source/JavaScriptCore/b3/air/opcode_generator.rb</a></li>
<li><a href="#trunkSourcecmakeOptionsWincmake">trunk/Source/cmake/OptionsWin.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (213703 => 213704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2017-03-10 07:19:04 UTC (rev 213703)
+++ trunk/ChangeLog 2017-03-10 08:36:11 UTC (rev 213704)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-10 Alex Christensen <achristensen@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.
+
</ins><span class="cx"> 2017-03-06 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix AppleWin build
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (213703 => 213704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-10 07:19:04 UTC (rev 213703)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-10 08:36:11 UTC (rev 213704)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-10 Alex Christensen <achristensen@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.
+
</ins><span class="cx"> 2017-03-09 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r213695.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3FenceValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3FenceValue.h (213703 => 213704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3FenceValue.h 2017-03-10 07:19:04 UTC (rev 213703)
+++ trunk/Source/JavaScriptCore/b3/B3FenceValue.h 2017-03-10 08:36:11 UTC (rev 213704)
</span><span class="lines">@@ -78,9 +78,9 @@
</span><span class="cx"> private:
</span><span class="cx"> friend class Procedure;
</span><span class="cx">
</span><del>- JS_EXPORT_PRIVATE FenceValue(Origin origin, HeapRange read, HeapRange write);
</del><ins>+ FenceValue(Origin origin, HeapRange read, HeapRange write);
</ins><span class="cx">
</span><del>- JS_EXPORT_PRIVATE FenceValue(Origin origin);
</del><ins>+ FenceValue(Origin origin);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } } // namespace JSC::B3
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Valueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Value.h (213703 => 213704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Value.h 2017-03-10 07:19:04 UTC (rev 213703)
+++ trunk/Source/JavaScriptCore/b3/B3Value.h 2017-03-10 08:36:11 UTC (rev 213704)
</span><span class="lines">@@ -476,7 +476,7 @@
</span><span class="cx"> Origin m_origin;
</span><span class="cx"> AdjacencyList m_children;
</span><span class="cx">
</span><del>- JS_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH static void badKind(Kind, unsigned);
</del><ins>+ NO_RETURN_DUE_TO_CRASH static void badKind(Kind, unsigned);
</ins><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> BasicBlock* owner { nullptr }; // computed by Procedure::resetValueOwners().
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airopcode_generatorrb"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/opcode_generator.rb (213703 => 213704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/opcode_generator.rb 2017-03-10 07:19:04 UTC (rev 213703)
+++ trunk/Source/JavaScriptCore/b3/air/opcode_generator.rb 2017-03-10 08:36:11 UTC (rev 213704)
</span><span class="lines">@@ -548,7 +548,7 @@
</span><span class="cx"> outp.puts "switch (#{inst}->kind.opcode) {"
</span><span class="cx"> $opcodes.values.each {
</span><span class="cx"> | opcode |
</span><del>- outp.puts "case #{opcode.name}:"
</del><ins>+ outp.puts "case Opcode::#{opcode.name}:"
</ins><span class="cx"> if opcode.custom
</span><span class="cx"> yield opcode, nil
</span><span class="cx"> else
</span><span class="lines">@@ -668,7 +668,7 @@
</span><span class="cx"> outp.puts "switch (opcode) {"
</span><span class="cx"> $opcodes.values.each {
</span><span class="cx"> | opcode |
</span><del>- outp.puts "case #{opcode.name}:"
</del><ins>+ outp.puts "case Opcode::#{opcode.name}:"
</ins><span class="cx"> if opcode.custom
</span><span class="cx"> outp.puts "OPGEN_RETURN(#{opcode.name}Custom::isValidFormStatic(arguments...));"
</span><span class="cx"> else
</span><span class="lines">@@ -721,7 +721,7 @@
</span><span class="cx"> $opcodes.values.each {
</span><span class="cx"> | opcode |
</span><span class="cx"> if opcode.attributes[:terminal]
</span><del>- outp.puts "case #{opcode.name}:"
</del><ins>+ outp.puts "case Opcode::#{opcode.name}:"
</ins><span class="cx"> didFindTerminals = true
</span><span class="cx"> end
</span><span class="cx"> }
</span><span class="lines">@@ -740,7 +740,7 @@
</span><span class="cx"> $opcodes.values.each {
</span><span class="cx"> | opcode |
</span><span class="cx"> if opcode.attributes[:return]
</span><del>- outp.puts "case #{opcode.name}:"
</del><ins>+ outp.puts "case Opcode::#{opcode.name}:"
</ins><span class="cx"> didFindReturns = true
</span><span class="cx"> end
</span><span class="cx"> }
</span><span class="lines">@@ -766,7 +766,7 @@
</span><span class="cx"> outp.puts " switch (opcode) {"
</span><span class="cx"> $opcodes.keys.each {
</span><span class="cx"> | opcode |
</span><del>- outp.puts " case #{opcode}:"
</del><ins>+ outp.puts " case Opcode::#{opcode}:"
</ins><span class="cx"> outp.puts " out.print(\"#{opcode}\");"
</span><span class="cx"> outp.puts " return;"
</span><span class="cx"> }
</span><span class="lines">@@ -839,7 +839,7 @@
</span><span class="cx"> outp.puts "switch (kind.opcode) {"
</span><span class="cx"> $opcodes.values.each {
</span><span class="cx"> | opcode |
</span><del>- outp.puts "case #{opcode.name}:"
</del><ins>+ outp.puts "case Opcode::#{opcode.name}:"
</ins><span class="cx">
</span><span class="cx"> if opcode.custom
</span><span class="cx"> outp.puts "OPGEN_RETURN(#{opcode.name}Custom::admitsStack(*this, argIndex));"
</span><span class="lines">@@ -983,7 +983,7 @@
</span><span class="cx"> $opcodes.values.each {
</span><span class="cx"> | opcode |
</span><span class="cx"> if opcode.attributes[:terminal]
</span><del>- outp.puts "case #{opcode.name}:"
</del><ins>+ outp.puts "case Opcode::#{opcode.name}:"
</ins><span class="cx"> foundTrue = true
</span><span class="cx"> end
</span><span class="cx"> }
</span><span class="lines">@@ -993,7 +993,7 @@
</span><span class="cx"> $opcodes.values.each {
</span><span class="cx"> | opcode |
</span><span class="cx"> if opcode.custom
</span><del>- outp.puts "case #{opcode.name}:"
</del><ins>+ outp.puts "case Opcode::#{opcode.name}:"
</ins><span class="cx"> outp.puts "return #{opcode.name}Custom::isTerminal(*this);"
</span><span class="cx"> end
</span><span class="cx"> }
</span><span class="lines">@@ -1011,7 +1011,7 @@
</span><span class="cx"> $opcodes.values.each {
</span><span class="cx"> | opcode |
</span><span class="cx"> if opcode.attributes[:effects]
</span><del>- outp.puts "case #{opcode.name}:"
</del><ins>+ outp.puts "case Opcode::#{opcode.name}:"
</ins><span class="cx"> foundTrue = true
</span><span class="cx"> end
</span><span class="cx"> }
</span><span class="lines">@@ -1021,7 +1021,7 @@
</span><span class="cx"> $opcodes.values.each {
</span><span class="cx"> | opcode |
</span><span class="cx"> if opcode.custom
</span><del>- outp.puts "case #{opcode.name}:"
</del><ins>+ outp.puts "case Opcode::#{opcode.name}:"
</ins><span class="cx"> outp.puts "return #{opcode.name}Custom::hasNonArgNonControlEffects(*this);"
</span><span class="cx"> end
</span><span class="cx"> }
</span><span class="lines">@@ -1039,7 +1039,7 @@
</span><span class="cx"> $opcodes.values.each {
</span><span class="cx"> | opcode |
</span><span class="cx"> if opcode.attributes[:terminal] or opcode.attributes[:effects]
</span><del>- outp.puts "case #{opcode.name}:"
</del><ins>+ outp.puts "case Opcode::#{opcode.name}:"
</ins><span class="cx"> foundTrue = true
</span><span class="cx"> end
</span><span class="cx"> }
</span><span class="lines">@@ -1049,7 +1049,7 @@
</span><span class="cx"> $opcodes.values.each {
</span><span class="cx"> | opcode |
</span><span class="cx"> if opcode.custom
</span><del>- outp.puts "case #{opcode.name}:"
</del><ins>+ outp.puts "case Opcode::#{opcode.name}:"
</ins><span class="cx"> outp.puts "return #{opcode.name}Custom::hasNonArgEffects(*this);"
</span><span class="cx"> end
</span><span class="cx"> }
</span><span class="lines">@@ -1137,7 +1137,7 @@
</span><span class="cx"> outp.puts "switch (inst.opcode) {"
</span><span class="cx"> $opcodes.values.each {
</span><span class="cx"> | opcode |
</span><del>- outp.puts "case #{opcode.name}:"
</del><ins>+ outp.puts "case Opcode::#{opcode.name}:"
</ins><span class="cx"> if opcode.custom
</span><span class="cx"> outp.puts "#{opcode.name}Custom.forEachArg(inst, func);"
</span><span class="cx"> else
</span><span class="lines">@@ -1193,7 +1193,7 @@
</span><span class="cx"> $opcodes.values.each {
</span><span class="cx"> | opcode |
</span><span class="cx"> if opcode.attributes[:terminal] or opcode.attributes[:effects]
</span><del>- outp.puts "case #{opcode.name}:"
</del><ins>+ outp.puts "case Opcode::#{opcode.name}:"
</ins><span class="cx"> foundTrue = true
</span><span class="cx"> end
</span><span class="cx"> }
</span><span class="lines">@@ -1203,7 +1203,7 @@
</span><span class="cx"> $opcodes.values.each {
</span><span class="cx"> | opcode |
</span><span class="cx"> if opcode.custom
</span><del>- outp.puts "case #{opcode.name}:"
</del><ins>+ outp.puts "case Opcode::#{opcode.name}:"
</ins><span class="cx"> outp.puts "return #{opcode.name}Custom.hasNonArgNonControlEffects(inst);"
</span><span class="cx"> end
</span><span class="cx"> }
</span><span class="lines">@@ -1217,7 +1217,7 @@
</span><span class="cx"> outp.puts "switch (opcode) {"
</span><span class="cx"> $opcodes.keys.sort.each_with_index {
</span><span class="cx"> | opcode, index |
</span><del>- outp.puts "case #{opcode}:"
</del><ins>+ outp.puts "case Opcode::#{opcode}:"
</ins><span class="cx"> outp.puts "return #{index}"
</span><span class="cx"> }
</span><span class="cx"> outp.puts "default:"
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWin.cmake (213703 => 213704)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIEW_MODE_CSS_MEDIA PUBLIC ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBASSEMBLY PRIVATE OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_ANIMATIONS PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_SOCKETS PUBLIC ON)
</span></span></pre>
</div>
</div>
</body>
</html>