Title: [204740] trunk/Source
Revision
204740
Author
keith_mil...@apple.com
Date
2016-08-22 14:38:39 -0700 (Mon, 22 Aug 2016)

Log Message

Actually enable the WASM build.
https://bugs.webkit.org/show_bug.cgi?id=160933

Reviewed by Geoffrey Garen.

Source/_javascript_Core:

Fix bug where we assumed that every frame would have a CodeBlock.

* inspector/ScriptCallStackFactory.cpp:
(Inspector::CreateScriptCallStackFunctor::operator()):

Source/WTF:

* wtf/FeatureDefines.h:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (204739 => 204740)


--- trunk/Source/_javascript_Core/ChangeLog	2016-08-22 21:31:55 UTC (rev 204739)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-08-22 21:38:39 UTC (rev 204740)
@@ -1,3 +1,15 @@
+2016-08-22  Keith Miller  <keith_mil...@apple.com>
+
+        Actually enable the WASM build.
+        https://bugs.webkit.org/show_bug.cgi?id=160933
+
+        Reviewed by Geoffrey Garen.
+
+        Fix bug where we assumed that every frame would have a CodeBlock.
+
+        * inspector/ScriptCallStackFactory.cpp:
+        (Inspector::CreateScriptCallStackFunctor::operator()):
+
 2016-08-22  Ryosuke Niwa  <rn...@webkit.org>
 
         Rename CustomElementsRegistry to CustomElementRegistry

Modified: trunk/Source/_javascript_Core/inspector/ScriptCallStackFactory.cpp (204739 => 204740)


--- trunk/Source/_javascript_Core/inspector/ScriptCallStackFactory.cpp	2016-08-22 21:31:55 UTC (rev 204739)
+++ trunk/Source/_javascript_Core/inspector/ScriptCallStackFactory.cpp	2016-08-22 21:38:39 UTC (rev 204740)
@@ -66,10 +66,6 @@
         }
 
         if (m_remainingCapacityForFrameCapture) {
-#if ENABLE(WEBASSEMBLY)
-            if (visitor->codeBlock()->ownerExecutable()->isWebAssemblyExecutable())
-                return StackVisitor::Continue;
-#endif
             unsigned line;
             unsigned column;
             visitor->computeLineAndColumn(line, column);

Modified: trunk/Source/WTF/ChangeLog (204739 => 204740)


--- trunk/Source/WTF/ChangeLog	2016-08-22 21:31:55 UTC (rev 204739)
+++ trunk/Source/WTF/ChangeLog	2016-08-22 21:38:39 UTC (rev 204740)
@@ -1,3 +1,12 @@
+2016-08-22  Keith Miller  <keith_mil...@apple.com>
+
+        Actually enable the WASM build.
+        https://bugs.webkit.org/show_bug.cgi?id=160933
+
+        Reviewed by Geoffrey Garen.
+
+        * wtf/FeatureDefines.h:
+
 2016-08-17  Don Olmstead  <don.olmst...@am.sony.com>
 
         Use find_library within Windows build

Modified: trunk/Source/WTF/wtf/FeatureDefines.h (204739 => 204740)


--- trunk/Source/WTF/wtf/FeatureDefines.h	2016-08-22 21:31:55 UTC (rev 204739)
+++ trunk/Source/WTF/wtf/FeatureDefines.h	2016-08-22 21:38:39 UTC (rev 204740)
@@ -153,12 +153,8 @@
 #endif
 
 #if !defined(ENABLE_WEBASSEMBLY)
-#if defined(ENABLE_B3_JIT)
-#define ENABLE_WEBASSEMBLY ENABLE_B3_JIT
-#else
-#define ENABLE_WEBASSEMBLY 0
+#define ENABLE_WEBASSEMBLY (defined(ENABLE_B3_JIT) && ENABLE_B3_JIT)
 #endif
-#endif
 
 #if !defined(ENABLE_WEBGL)
 #define ENABLE_WEBGL 1
@@ -219,12 +215,8 @@
 #endif
 
 #if !defined(ENABLE_WEBASSEMBLY)
-#if defined(ENABLE_B3_JIT)
-#define ENABLE_WEBASSEMBLY ENABLE_B3_JIT
-#else
-#define ENABLE_WEBASSEMBLY 0
+#define ENABLE_WEBASSEMBLY (defined(ENABLE_B3_JIT) && ENABLE_B3_JIT)
 #endif
-#endif
 
 #if !defined(ENABLE_WEB_ARCHIVE)
 #define ENABLE_WEB_ARCHIVE 1
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to