Changeset 212616 in webkit for trunk/Source/JavaScriptCore/jsc.cpp

Timestamp:

Feb 19, 2017, 2:07:58 PM (8 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r212466.
​https://bugs.webkit.org/show_bug.cgi?id=168577

causes crashes on AArch64 on linux, maybe it's causing crashes
on iOS too (Requested by pizlo on #webkit).

Reverted changeset:

"The collector thread should only start when the mutator
doesn't have heap access"
​https://bugs.webkit.org/show_bug.cgi?id=167737
​http://trac.webkit.org/changeset/212466

File:

• trunk/Source/JavaScriptCore/jsc.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/jsc.cpp

@@ -39 +39 @@
 #include "HeapProfiler.h"
 #include "HeapSnapshotBuilder.h"
+#include "HeapStatistics.h"
 #include "InitializeThreading.h"
 #include "Interpreter.h"
@@ -1084 +1085 @@
 static EncodedJSValue JSC_HOST_CALL functionWaitForReport(ExecState*);
 static EncodedJSValue JSC_HOST_CALL functionHeapCapacity(ExecState*);
-static EncodedJSValue JSC_HOST_CALL functionFlashHeapAccess(ExecState*);
 
 struct Script {
@@ -1367 +1367 @@
 
         addFunction(vm, "heapCapacity", functionHeapCapacity, 0);
-        addFunction(vm, "flashHeapAccess", functionFlashHeapAccess, 0);
     }
     
@@ -2650 +2649 @@
 }
 
-EncodedJSValue JSC_HOST_CALL functionFlashHeapAccess(ExecState* exec)
-{
-    VM& vm = exec->vm();
-    auto scope = DECLARE_THROW_SCOPE(vm);
-    
-    vm.heap.releaseAccess();
-    if (exec->argumentCount() >= 1) {
-        double ms = exec->argument(0).toNumber(exec);
-        RETURN_IF_EXCEPTION(scope, encodedJSValue());
-        sleep(Seconds::fromMilliseconds(ms));
-    }
-    vm.heap.acquireAccess();
-    return JSValue::encode(jsUndefined());
-}
-
 template<typename ValueType>
 typename std::enable_if<!std::is_fundamental<ValueType>::value>::type addOption(VM&, JSObject*, Identifier, ValueType) { }