Unreviewed, fix cloop build.
authorfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Feb 2017 23:16:36 +0000 (23:16 +0000)
committerfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Feb 2017 23:16:36 +0000 (23:16 +0000)
* heap/Heap.cpp:
(JSC::Heap::stopThePeriphery):
* runtime/JSLock.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@212472 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/heap/Heap.cpp
Source/JavaScriptCore/runtime/JSLock.cpp

index e905924..2140975 100644 (file)
@@ -1,3 +1,11 @@
+2017-02-16  Filip Pizlo  <fpizlo@apple.com>
+
+        Unreviewed, fix cloop build.
+
+        * heap/Heap.cpp:
+        (JSC::Heap::stopThePeriphery):
+        * runtime/JSLock.cpp:
+
 2017-02-10  Filip Pizlo  <fpizlo@apple.com>
 
         The collector thread should only start when the mutator doesn't have heap access
index 607da94..f0645ce 100644 (file)
@@ -1474,6 +1474,8 @@ void Heap::stopThePeriphery(GCConductor conn)
             && conn == GCConductor::Collector)
             setGCDidJIT();
     }
+#else
+    UNUSED_PARAM(conn);
 #endif // ENABLE(JIT)
     
     vm()->shadowChicken().update(*vm(), vm()->topCallFrame);
index d90386c..3ca542a 100644 (file)
@@ -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>