Title: [212780] trunk/Source/_javascript_Core
Revision
212780
Author
[email protected]
Date
2017-02-21 17:05:13 -0800 (Tue, 21 Feb 2017)

Log Message

Unreviewed, fix cloop. I managed to have my local patch for relanding be the one without the cloop
fix. I keep forgetting about cloop!

* heap/Heap.cpp:
(JSC::Heap::stopThePeriphery):
* runtime/JSLock.cpp:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (212779 => 212780)


--- trunk/Source/_javascript_Core/ChangeLog	2017-02-22 01:01:16 UTC (rev 212779)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-02-22 01:05:13 UTC (rev 212780)
@@ -1,3 +1,12 @@
+2017-02-21  Filip Pizlo  <[email protected]>
+
+        Unreviewed, fix cloop. I managed to have my local patch for relanding be the one without the cloop
+        fix. I keep forgetting about cloop!
+
+        * heap/Heap.cpp:
+        (JSC::Heap::stopThePeriphery):
+        * runtime/JSLock.cpp:
+
 2017-02-21  Mark Lam  <[email protected]>
 
         Add missing exception checks detected by running marathon.js.

Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (212779 => 212780)


--- trunk/Source/_javascript_Core/heap/Heap.cpp	2017-02-22 01:01:16 UTC (rev 212779)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp	2017-02-22 01:05:13 UTC (rev 212780)
@@ -1474,6 +1474,8 @@
             && conn == GCConductor::Collector)
             setGCDidJIT();
     }
+#else
+    UNUSED_PARAM(conn);
 #endif // ENABLE(JIT)
     
     vm()->shadowChicken().update(*vm(), vm()->topCallFrame);

Modified: trunk/Source/_javascript_Core/runtime/JSLock.cpp (212779 => 212780)


--- trunk/Source/_javascript_Core/runtime/JSLock.cpp	2017-02-22 01:01:16 UTC (rev 212779)
+++ trunk/Source/_javascript_Core/runtime/JSLock.cpp	2017-02-22 01:05:13 UTC (rev 212780)
@@ -26,6 +26,7 @@
 #include "JSGlobalObject.h"
 #include "JSObject.h"
 #include "JSCInlines.h"
+#include "MachineStackMarker.h"
 #include "SamplingProfiler.h"
 #include <thread>
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to