Title: [220960] trunk/Source
Revision
220960
Author
[email protected]
Date
2017-08-20 23:56:19 -0700 (Sun, 20 Aug 2017)

Log Message

Gardening: fix CLoop build.
https://bugs.webkit.org/show_bug.cgi?id=175688
<rdar://problem/33436870>

Not reviewed.

Source/_javascript_Core:

Make these files dependent on ENABLE(MASM_PROBE).

* assembler/ProbeContext.cpp:
* assembler/ProbeContext.h:
* assembler/ProbeStack.cpp:
* assembler/ProbeStack.h:

Source/WTF:

Disable MASM_PROBE if !ENABLE(JIT).

* wtf/Platform.h:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (220959 => 220960)


--- trunk/Source/_javascript_Core/ChangeLog	2017-08-21 06:21:38 UTC (rev 220959)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-08-21 06:56:19 UTC (rev 220960)
@@ -1,5 +1,20 @@
 2017-08-20  Mark Lam  <[email protected]>
 
+        Gardening: fix CLoop build.
+        https://bugs.webkit.org/show_bug.cgi?id=175688
+        <rdar://problem/33436870>
+
+        Not reviewed.
+
+        Make these files dependent on ENABLE(MASM_PROBE).
+
+        * assembler/ProbeContext.cpp:
+        * assembler/ProbeContext.h:
+        * assembler/ProbeStack.cpp:
+        * assembler/ProbeStack.h:
+
+2017-08-20  Mark Lam  <[email protected]>
+
         Enhance MacroAssembler::probe() to allow the probe function to resize the stack frame and alter stack data in one pass.
         https://bugs.webkit.org/show_bug.cgi?id=175688
         <rdar://problem/33436870>

Modified: trunk/Source/_javascript_Core/assembler/ProbeContext.cpp (220959 => 220960)


--- trunk/Source/_javascript_Core/assembler/ProbeContext.cpp	2017-08-21 06:21:38 UTC (rev 220959)
+++ trunk/Source/_javascript_Core/assembler/ProbeContext.cpp	2017-08-21 06:56:19 UTC (rev 220960)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "ProbeContext.h"
 
+#if ENABLE(MASM_PROBE)
+
 namespace JSC {
 namespace Probe {
 
@@ -74,3 +76,5 @@
 
 } // namespace Probe
 } // namespace JSC
+
+#endif // ENABLE(MASM_PROBE)

Modified: trunk/Source/_javascript_Core/assembler/ProbeContext.h (220959 => 220960)


--- trunk/Source/_javascript_Core/assembler/ProbeContext.h	2017-08-21 06:21:38 UTC (rev 220959)
+++ trunk/Source/_javascript_Core/assembler/ProbeContext.h	2017-08-21 06:56:19 UTC (rev 220960)
@@ -28,6 +28,8 @@
 #include "MacroAssembler.h"
 #include "ProbeStack.h"
 
+#if ENABLE(MASM_PROBE)
+
 namespace JSC {
 namespace Probe {
 
@@ -247,5 +249,6 @@
 void executeProbe(State*);
 
 } // namespace Probe
+} // namespace JSC
 
-} // namespace JSC
+#endif // ENABLE(MASM_PROBE)

Modified: trunk/Source/_javascript_Core/assembler/ProbeStack.cpp (220959 => 220960)


--- trunk/Source/_javascript_Core/assembler/ProbeStack.cpp	2017-08-21 06:21:38 UTC (rev 220959)
+++ trunk/Source/_javascript_Core/assembler/ProbeStack.cpp	2017-08-21 06:56:19 UTC (rev 220960)
@@ -28,6 +28,8 @@
 
 #include <memory>
 
+#if ENABLE(MASM_PROBE)
+
 namespace JSC {
 namespace Probe {
 
@@ -108,3 +110,5 @@
 
 } // namespace Probe
 } // namespace JSC
+
+#endif // ENABLE(MASM_PROBE)

Modified: trunk/Source/_javascript_Core/assembler/ProbeStack.h (220959 => 220960)


--- trunk/Source/_javascript_Core/assembler/ProbeStack.h	2017-08-21 06:21:38 UTC (rev 220959)
+++ trunk/Source/_javascript_Core/assembler/ProbeStack.h	2017-08-21 06:56:19 UTC (rev 220960)
@@ -29,6 +29,8 @@
 #include <wtf/StdLibExtras.h>
 #include <wtf/Threading.h>
 
+#if ENABLE(MASM_PROBE)
+
 namespace JSC {
 
 struct ProbeContext;
@@ -191,3 +193,5 @@
 
 } // namespace Probe
 } // namespace JSC
+
+#endif // ENABLE(MASM_PROBE)

Modified: trunk/Source/WTF/ChangeLog (220959 => 220960)


--- trunk/Source/WTF/ChangeLog	2017-08-21 06:21:38 UTC (rev 220959)
+++ trunk/Source/WTF/ChangeLog	2017-08-21 06:56:19 UTC (rev 220960)
@@ -1,3 +1,15 @@
+2017-08-20  Mark Lam  <[email protected]>
+
+        Gardening: fix CLoop build.
+        https://bugs.webkit.org/show_bug.cgi?id=175688
+        <rdar://problem/33436870>
+
+        Not reviewed.
+
+        Disable MASM_PROBE if !ENABLE(JIT).
+
+        * wtf/Platform.h:
+
 2017-08-18  Ryan Haddad  <[email protected]>
 
         Unreviewed, rolling out r220938.

Modified: trunk/Source/WTF/wtf/Platform.h (220959 => 220960)


--- trunk/Source/WTF/wtf/Platform.h	2017-08-21 06:21:38 UTC (rev 220959)
+++ trunk/Source/WTF/wtf/Platform.h	2017-08-21 06:56:19 UTC (rev 220960)
@@ -827,7 +827,7 @@
 #define ENABLE_MASM_PROBE 0
 #endif
 
-#if OS(WINDOW)
+#if !ENABLE(JIT) || OS(WINDOW)
 #undef ENABLE_MASM_PROBE
 #define ENABLE_MASM_PROBE 0
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to