Title: [212472] trunk/Source/_javascript_Core
- Revision
- 212472
- Author
- fpi...@apple.com
- Date
- 2017-02-16 15:16:36 -0800 (Thu, 16 Feb 2017)
Log Message
Unreviewed, fix cloop build.
* heap/Heap.cpp:
(JSC::Heap::stopThePeriphery):
* runtime/JSLock.cpp:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (212471 => 212472)
--- trunk/Source/_javascript_Core/ChangeLog 2017-02-16 23:16:13 UTC (rev 212471)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-02-16 23:16:36 UTC (rev 212472)
@@ -1,3 +1,11 @@
+2017-02-16 Filip Pizlo <fpi...@apple.com>
+
+ Unreviewed, fix cloop build.
+
+ * heap/Heap.cpp:
+ (JSC::Heap::stopThePeriphery):
+ * runtime/JSLock.cpp:
+
2017-02-10 Filip Pizlo <fpi...@apple.com>
The collector thread should only start when the mutator doesn't have heap access
Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (212471 => 212472)
--- trunk/Source/_javascript_Core/heap/Heap.cpp 2017-02-16 23:16:13 UTC (rev 212471)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp 2017-02-16 23:16:36 UTC (rev 212472)
@@ -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 (212471 => 212472)
--- trunk/Source/_javascript_Core/runtime/JSLock.cpp 2017-02-16 23:16:13 UTC (rev 212471)
+++ trunk/Source/_javascript_Core/runtime/JSLock.cpp 2017-02-16 23:16:36 UTC (rev 212472)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005, 2008, 2012, 2014, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2005-2017 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -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
