Title: [213039] releases/WebKitGTK/webkit-2.16/Source/_javascript_Core
- Revision
- 213039
- Author
- carlo...@webkit.org
- Date
- 2017-02-27 01:03:30 -0800 (Mon, 27 Feb 2017)
Log Message
Merge r212780 - 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: releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/ChangeLog (213038 => 213039)
--- releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/ChangeLog 2017-02-27 09:03:23 UTC (rev 213038)
+++ releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/ChangeLog 2017-02-27 09:03:30 UTC (rev 213039)
@@ -1,3 +1,12 @@
+2017-02-21 Filip Pizlo <fpi...@apple.com>
+
+ 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 <mark....@apple.com>
Add missing exception checks detected by running marathon.js.
Modified: releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/heap/Heap.cpp (213038 => 213039)
--- releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/heap/Heap.cpp 2017-02-27 09:03:23 UTC (rev 213038)
+++ releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/heap/Heap.cpp 2017-02-27 09:03:30 UTC (rev 213039)
@@ -1474,6 +1474,8 @@
&& conn == GCConductor::Collector)
setGCDidJIT();
}
+#else
+ UNUSED_PARAM(conn);
#endif // ENABLE(JIT)
vm()->shadowChicken().update(*vm(), vm()->topCallFrame);
Modified: releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/runtime/JSLock.cpp (213038 => 213039)
--- releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/runtime/JSLock.cpp 2017-02-27 09:03:23 UTC (rev 213038)
+++ releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/runtime/JSLock.cpp 2017-02-27 09:03:30 UTC (rev 213039)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
