[webkit-changes] [190722] trunk/Source/JavaScriptCore

[ossy]

Title: [190722] trunk/Source/_javascript_Core

Revision

190722

Author

o...@webkit.org

Date

2015-10-08 08:20:52 -0700 (Thu, 08 Oct 2015)

Log Message

Fix the WASM build on Linux
https://bugs.webkit.org/show_bug.cgi?id=149919

Reviewed by Mark Lam.

* inspector/ScriptCallStackFactory.cpp:
* wasm/JSWASMModule.cpp:
* wasm/WASMFunctionCompiler.h:
(JSC::sizeOfMemoryType):
* wasm/WASMFunctionLLVMIRGenerator.h:

Modified Paths

• trunk/Source/_javascript_Core/ChangeLog
• trunk/Source/_javascript_Core/inspector/ScriptCallStackFactory.cpp
• trunk/Source/_javascript_Core/wasm/JSWASMModule.cpp
• trunk/Source/_javascript_Core/wasm/WASMFunctionCompiler.h
• trunk/Source/_javascript_Core/wasm/WASMFunctionLLVMIRGenerator.h

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (190721 => 190722)

--- trunk/Source/_javascript_Core/ChangeLog	2015-10-08 13:28:54 UTC (rev 190721)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-10-08 15:20:52 UTC (rev 190722)
@@ -1,5 +1,18 @@
 2015-10-08  Csaba Osztrogonác  <o...@webkit.org>
 
+        Fix the WASM build on Linux
+        https://bugs.webkit.org/show_bug.cgi?id=149919
+
+        Reviewed by Mark Lam.
+
+        * inspector/ScriptCallStackFactory.cpp:
+        * wasm/JSWASMModule.cpp:
+        * wasm/WASMFunctionCompiler.h:
+        (JSC::sizeOfMemoryType):
+        * wasm/WASMFunctionLLVMIRGenerator.h:
+
+2015-10-08  Csaba Osztrogonác  <o...@webkit.org>
+
         Unreviewed CLOOP buildfix after r190718.
 
         * jit/Repatch.h:

Modified: trunk/Source/_javascript_Core/inspector/ScriptCallStackFactory.cpp (190721 => 190722)

--- trunk/Source/_javascript_Core/inspector/ScriptCallStackFactory.cpp	2015-10-08 13:28:54 UTC (rev 190721)
+++ trunk/Source/_javascript_Core/inspector/ScriptCallStackFactory.cpp	2015-10-08 15:20:52 UTC (rev 190722)
@@ -34,6 +34,7 @@
 #include "ScriptCallStackFactory.h"
 
 #include "CallFrame.h"
+#include "CodeBlock.h"
 #include "Exception.h"
 #include "JSCJSValue.h"
 #include "JSCInlines.h"

Modified: trunk/Source/_javascript_Core/wasm/JSWASMModule.cpp (190721 => 190722)

--- trunk/Source/_javascript_Core/wasm/JSWASMModule.cpp	2015-10-08 13:28:54 UTC (rev 190721)
+++ trunk/Source/_javascript_Core/wasm/JSWASMModule.cpp	2015-10-08 15:20:52 UTC (rev 190722)
@@ -29,6 +29,7 @@
 #if ENABLE(WEBASSEMBLY)
 
 #include "JSArrayBuffer.h"
+#include "JSCJSValueInlines.h"
 #include "JSCellInlines.h"
 #include "JSFunction.h"
 #include "SlotVisitorInlines.h"

Modified: trunk/Source/_javascript_Core/wasm/WASMFunctionCompiler.h (190721 => 190722)

--- trunk/Source/_javascript_Core/wasm/WASMFunctionCompiler.h	2015-10-08 13:28:54 UTC (rev 190721)
+++ trunk/Source/_javascript_Core/wasm/WASMFunctionCompiler.h	2015-10-08 15:20:52 UTC (rev 190722)
@@ -94,6 +94,8 @@
     default:
         ASSERT_NOT_REACHED();
     }
+    RELEASE_ASSERT_NOT_REACHED();
+    return 0;
 }
 
 class WASMFunctionCompiler : private CCallHelpers {

Modified: trunk/Source/_javascript_Core/wasm/WASMFunctionLLVMIRGenerator.h (190721 => 190722)

--- trunk/Source/_javascript_Core/wasm/WASMFunctionLLVMIRGenerator.h	2015-10-08 13:28:54 UTC (rev 190721)
+++ trunk/Source/_javascript_Core/wasm/WASMFunctionLLVMIRGenerator.h	2015-10-08 15:20:52 UTC (rev 190722)
@@ -26,7 +26,7 @@
 #ifndef WASMFunctionLLVMIRGenerator_h
 #define WASMFunctionLLVMIRGenerator_h
 
-#if ENABLE(WEBASSEMBLY)
+#if ENABLE(WEBASSEMBLY) && ENABLE(FTL_JIT)
 
 #include "FTLAbbreviatedTypes.h"
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes