<!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>[205021] 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/205021">205021</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-26 09:54:14 -0700 (Fri, 26 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the ENABLE(WEBASSEMBLY) build on Linux
https://bugs.webkit.org/show_bug.cgi?id=161197
Reviewed by Mark Lam.
Source/JavaScriptCore:
* CMakeLists.txt:
* b3/B3Common.cpp:
(JSC::B3::shouldDumpIR):
* shell/CMakeLists.txt:
* wasm/JSWASMModule.h:
* wasm/WASMB3IRGenerator.cpp:
(JSC::WASM::toB3Op):
* wasm/WASMB3IRGenerator.h:
* wasm/WASMFormat.h:
* wasm/WASMFunctionParser.h:
* wasm/WASMModuleParser.cpp:
(JSC::WASM::WASMModuleParser::parseFunctionTypes):
* wasm/WASMModuleParser.h:
* wasm/WASMParser.h:
* wasm/WASMPlan.cpp:
* wasm/WASMPlan.h:
* wasm/WASMSections.cpp:
Source/WTF:
* wtf/Platform.h:
Tools:
* Scripts/build-jsc:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Commoncpp">trunk/Source/JavaScriptCore/b3/B3Common.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreshellCMakeListstxt">trunk/Source/JavaScriptCore/shell/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmJSWASMModuleh">trunk/Source/JavaScriptCore/wasm/JSWASMModule.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMB3IRGeneratorcpp">trunk/Source/JavaScriptCore/wasm/WASMB3IRGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMB3IRGeneratorh">trunk/Source/JavaScriptCore/wasm/WASMB3IRGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMFormath">trunk/Source/JavaScriptCore/wasm/WASMFormat.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMFunctionParserh">trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMModuleParsercpp">trunk/Source/JavaScriptCore/wasm/WASMModuleParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMModuleParserh">trunk/Source/JavaScriptCore/wasm/WASMModuleParser.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMParserh">trunk/Source/JavaScriptCore/wasm/WASMParser.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMPlancpp">trunk/Source/JavaScriptCore/wasm/WASMPlan.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMPlanh">trunk/Source/JavaScriptCore/wasm/WASMPlan.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMSectionscpp">trunk/Source/JavaScriptCore/wasm/WASMSections.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsbuildjsc">trunk/Tools/Scripts/build-jsc</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -841,6 +841,10 @@
</span><span class="cx"> tools/JSDollarVMPrototype.cpp
</span><span class="cx">
</span><span class="cx"> wasm/JSWASMModule.cpp
</span><ins>+ wasm/WASMB3IRGenerator.cpp
+ wasm/WASMModuleParser.cpp
+ wasm/WASMPlan.cpp
+ wasm/WASMSections.cpp
</ins><span class="cx">
</span><span class="cx"> yarr/RegularExpression.cpp
</span><span class="cx"> yarr/YarrCanonicalizeUCS2.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-08-26 Csaba Osztrogonác <ossy@webkit.org>
+
+ Fix the ENABLE(WEBASSEMBLY) build on Linux
+ https://bugs.webkit.org/show_bug.cgi?id=161197
+
+ Reviewed by Mark Lam.
+
+ * CMakeLists.txt:
+ * b3/B3Common.cpp:
+ (JSC::B3::shouldDumpIR):
+ * shell/CMakeLists.txt:
+ * wasm/JSWASMModule.h:
+ * wasm/WASMB3IRGenerator.cpp:
+ (JSC::WASM::toB3Op):
+ * wasm/WASMB3IRGenerator.h:
+ * wasm/WASMFormat.h:
+ * wasm/WASMFunctionParser.h:
+ * wasm/WASMModuleParser.cpp:
+ (JSC::WASM::WASMModuleParser::parseFunctionTypes):
+ * wasm/WASMModuleParser.h:
+ * wasm/WASMParser.h:
+ * wasm/WASMPlan.cpp:
+ * wasm/WASMPlan.h:
+ * wasm/WASMSections.cpp:
+
</ins><span class="cx"> 2016-08-26 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Compile fix.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Commoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Common.cpp (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Common.cpp 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Source/JavaScriptCore/b3/B3Common.cpp 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -36,7 +36,11 @@
</span><span class="cx">
</span><span class="cx"> bool shouldDumpIR(B3ComplitationMode mode)
</span><span class="cx"> {
</span><ins>+#if ENABLE(FTL_JIT)
</ins><span class="cx"> return FTL::verboseCompilationEnabled() || FTL::shouldDumpDisassembly() || shouldDumpIRAtEachPhase(mode);
</span><ins>+#else
+ return shouldDumpIRAtEachPhase(mode);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool shouldDumpIRAtEachPhase(B3ComplitationMode mode)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreshellCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/shell/CMakeLists.txt (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/shell/CMakeLists.txt 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Source/JavaScriptCore/shell/CMakeLists.txt 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -49,6 +49,10 @@
</span><span class="cx"> ../b3/air/testair.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ set(TESTWASM_SOURCES
+ ../testWASM.cpp
+ )
+
</ins><span class="cx"> add_executable(testb3 ${TESTB3_SOURCES})
</span><span class="cx"> target_link_libraries(testb3 ${JSC_LIBRARIES})
</span><span class="cx">
</span><span class="lines">@@ -55,4 +59,7 @@
</span><span class="cx"> add_executable(testair ${TESTAIR_SOURCES})
</span><span class="cx"> target_link_libraries(testair ${JSC_LIBRARIES})
</span><span class="cx">
</span><ins>+ add_executable(testWASM ${TESTWASM_SOURCES})
+ target_link_libraries(testWASM ${JSC_LIBRARIES})
+
</ins><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmJSWASMModuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/JSWASMModule.h (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/JSWASMModule.h 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Source/JavaScriptCore/wasm/JSWASMModule.h 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef JSWASMModule_h
-#define JSWASMModule_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEBASSEMBLY)
</span><span class="cx">
</span><span class="lines">@@ -114,5 +113,3 @@
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEBASSEMBLY)
</span><del>-
-#endif // JSWASMModule_h
</del></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMB3IRGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMB3IRGenerator.cpp (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMB3IRGenerator.cpp 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Source/JavaScriptCore/wasm/WASMB3IRGenerator.cpp 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WASMB3IRGenerator.h"
</span><span class="cx">
</span><ins>+#if ENABLE(WEBASSEMBLY)
+
</ins><span class="cx"> #include "B3BasicBlockInlines.h"
</span><span class="cx"> #include "B3ValueInlines.h"
</span><span class="cx"> #include "B3Variable.h"
</span><span class="lines">@@ -33,8 +35,6 @@
</span><span class="cx"> #include "WASMFunctionParser.h"
</span><span class="cx"> #include <wtf/Optional.h>
</span><span class="cx">
</span><del>-#if ENABLE(WEBASSEMBLY)
-
</del><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> namespace WASM {
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> FOR_EACH_WASM_BINARY_OP(CREATE_CASE)
</span><span class="cx"> #undef CREATE_CASE
</span><span class="cx"> }
</span><ins>+ RELEASE_ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline B3::Opcode toB3Op(WASMUnaryOpType op)
</span><span class="lines">@@ -57,6 +58,7 @@
</span><span class="cx"> FOR_EACH_WASM_UNARY_OP(CREATE_CASE)
</span><span class="cx"> #undef CREATE_CASE
</span><span class="cx"> }
</span><ins>+ RELEASE_ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class B3IRGenerator {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMB3IRGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMB3IRGenerator.h (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMB3IRGenerator.h 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Source/JavaScriptCore/wasm/WASMB3IRGenerator.h 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -25,12 +25,12 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><ins>+#if ENABLE(WEBASSEMBLY)
+
</ins><span class="cx"> #include "B3Compilation.h"
</span><span class="cx"> #include "VM.h"
</span><span class="cx"> #include "WASMFormat.h"
</span><span class="cx">
</span><del>-#if ENABLE(WEBASSEMBLY)
-
</del><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> namespace WASM {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFormath"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFormat.h (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFormat.h 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Source/JavaScriptCore/wasm/WASMFormat.h 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -40,8 +40,7 @@
</span><span class="cx"> * limitations under the License.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WASMFormat_h
-#define WASMFormat_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEBASSEMBLY)
</span><span class="cx">
</span><span class="lines">@@ -101,5 +100,3 @@
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEBASSEMBLY)
</span><del>-
-#endif // WASMFormat_h
</del></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -25,11 +25,11 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><ins>+#if ENABLE(WEBASSEMBLY)
+
</ins><span class="cx"> #include "WASMParser.h"
</span><span class="cx"> #include <wtf/DataLog.h>
</span><span class="cx">
</span><del>-#if ENABLE(WEBASSEMBLY)
-
</del><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> namespace WASM {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMModuleParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMModuleParser.cpp (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMModuleParser.cpp 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Source/JavaScriptCore/wasm/WASMModuleParser.cpp 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -26,12 +26,12 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WASMModuleParser.h"
</span><span class="cx">
</span><ins>+#if ENABLE(WEBASSEMBLY)
+
</ins><span class="cx"> #include "WASMFormat.h"
</span><span class="cx"> #include "WASMOps.h"
</span><span class="cx"> #include "WASMSections.h"
</span><span class="cx">
</span><del>-#if ENABLE(WEBASSEMBLY)
-
</del><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> namespace WASM {
</span><span class="lines">@@ -180,6 +180,7 @@
</span><span class="cx"> returnType = WASMFunctionReturnType::Void;
</span><span class="cx">
</span><span class="cx"> // TODO: Actually do something with this data...
</span><ins>+ UNUSED_PARAM(returnType);
</ins><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMModuleParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMModuleParser.h (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMModuleParser.h 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Source/JavaScriptCore/wasm/WASMModuleParser.h 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -25,12 +25,12 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><ins>+#if ENABLE(WEBASSEMBLY)
+
</ins><span class="cx"> #include "WASMOps.h"
</span><span class="cx"> #include "WASMParser.h"
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if ENABLE(WEBASSEMBLY)
-
</del><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> namespace WASM {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMParser.h (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMParser.h 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Source/JavaScriptCore/wasm/WASMParser.h 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><ins>+#if ENABLE(WEBASSEMBLY)
+
</ins><span class="cx"> #include "B3Compilation.h"
</span><span class="cx"> #include "B3Procedure.h"
</span><span class="cx"> #include "WASMFormat.h"
</span><span class="lines">@@ -32,8 +34,6 @@
</span><span class="cx"> #include "WASMSections.h"
</span><span class="cx"> #include <wtf/LEBDecoder.h>
</span><span class="cx">
</span><del>-#if ENABLE(WEBASSEMBLY)
-
</del><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> namespace WASM {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMPlancpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMPlan.cpp (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMPlan.cpp 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Source/JavaScriptCore/wasm/WASMPlan.cpp 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -26,13 +26,13 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WASMPlan.h"
</span><span class="cx">
</span><ins>+#if ENABLE(WEBASSEMBLY)
+
</ins><span class="cx"> #include "B3Compilation.h"
</span><span class="cx"> #include "WASMB3IRGenerator.h"
</span><span class="cx"> #include "WASMModuleParser.h"
</span><span class="cx"> #include <wtf/DataLog.h>
</span><span class="cx">
</span><del>-#if ENABLE(WEBASSEMBLY)
-
</del><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> namespace WASM {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMPlanh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMPlan.h (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMPlan.h 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Source/JavaScriptCore/wasm/WASMPlan.h 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -25,13 +25,13 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><ins>+#if ENABLE(WEBASSEMBLY)
+
</ins><span class="cx"> #include "CompilationResult.h"
</span><span class="cx"> #include "VM.h"
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if ENABLE(WEBASSEMBLY)
-
</del><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> namespace B3 {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMSectionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMSections.cpp (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMSections.cpp 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Source/JavaScriptCore/wasm/WASMSections.cpp 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WASMSections.h"
</span><span class="cx">
</span><ins>+#if ENABLE(WEBASSEMBLY)
+
</ins><span class="cx"> #include <wtf/DataLog.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if ENABLE(WEBASSEMBLY)
-
</del><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> namespace WASM {
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Source/WTF/ChangeLog 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-08-26 Csaba Osztrogonác <ossy@webkit.org>
+
+ Fix the ENABLE(WEBASSEMBLY) build on Linux
+ https://bugs.webkit.org/show_bug.cgi?id=161197
+
+ Reviewed by Mark Lam.
+
+ * wtf/Platform.h:
+
</ins><span class="cx"> 2016-08-25 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [DFG][FTL] Implement ES6 Generators in DFG / FTL
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Source/WTF/wtf/Platform.h 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -774,8 +774,8 @@
</span><span class="cx"> #define ENABLE_CONCURRENT_JIT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-/* This controls whether B3 is built. It will not be used unless FTL_USES_B3 is enabled. */
-#if ENABLE(FTL_JIT)
</del><ins>+/* This controls whether B3 is built. B3 is needed for FTL JIT and WebAssembly */
+#if ENABLE(FTL_JIT) || ENABLE(WEBASSEMBLY)
</ins><span class="cx"> #define ENABLE_B3_JIT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Tools/ChangeLog 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-08-26 Csaba Osztrogonác <ossy@webkit.org>
+
+ Fix the ENABLE(WEBASSEMBLY) build on Linux
+ https://bugs.webkit.org/show_bug.cgi?id=161197
+
+ Reviewed by Mark Lam.
+
+ * Scripts/build-jsc:
+
</ins><span class="cx"> 2016-08-26 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] run-gtk-tests should use the driver environment for checking the accessibility bus
</span></span></pre></div>
<a id="trunkToolsScriptsbuildjsc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-jsc (205020 => 205021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-jsc 2016-08-26 16:50:15 UTC (rev 205020)
+++ trunk/Tools/Scripts/build-jsc 2016-08-26 16:54:14 UTC (rev 205021)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> unless (isAnyWindows()) {
</span><span class="cx"> # By default we build using all of the available CPUs
</span><span class="cx"> $makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
</span><del>- $buildTarget = "jsc testb3 testair $makeArgs";
</del><ins>+ $buildTarget = "jsc testb3 testair testWASM $makeArgs";
</ins><span class="cx"> } elsif (canUseNinja()) {
</span><span class="cx"> $buildTarget .= "jsc testapi";
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>