Changeset 163027 in webkit for trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp

Timestamp:

Jan 29, 2014, 11:18:54 AM (11 years ago)

Author:

[email protected]

Message:

Merge the jsCStack branch
​https://bugs.webkit.org/show_bug.cgi?id=127763

Reviewed by Mark Hahnenberg.

Source/JavaScriptCore:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

Source/WebCore:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

Source/WTF:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

File:

• trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp (modified) (6 diffs)

trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2011, 2012, 2013, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57 +57 @@
 #if ENABLE(DFG_JIT)
 static CompilationResult compileImpl(
-    VM& vm, CodeBlock* codeBlock, CompilationMode mode, unsigned osrEntryBytecodeIndex,
-    const Operands<JSValue>& mustHandleValues,
-    PassRefPtr<DeferredCompilationCallback> callback, Worklist* worklist)
+    VM& vm, CodeBlock* codeBlock, CodeBlock* profiledDFGCodeBlock, CompilationMode mode,
+    unsigned osrEntryBytecodeIndex, const Operands<JSValue>& mustHandleValues,
+    PassRefPtr<DeferredCompilationCallback> callback)
 {
     SamplingRegion samplingRegion("DFG Compilation (Driver)");
@@ -68 +68 @@
     ASSERT(codeBlock->alternative());
     ASSERT(codeBlock->alternative()->jitType() == JITCode::BaselineJIT);
+    ASSERT(!profiledDFGCodeBlock || profiledDFGCodeBlock->jitType() == JITCode::DFGJIT);
     
     if (!Options::useDFGJIT() || !MacroAssembler::supportsFloatingPoint())
@@ -89 +90 @@
     vm.getCTIStub(osrExitGenerationThunkGenerator);
     vm.getCTIStub(throwExceptionFromCallSlowPathGenerator);
-    vm.getCTIStub(linkCallThunkGenerator);
-    vm.getCTIStub(linkConstructThunkGenerator);
-    vm.getCTIStub(linkClosureCallThunkGenerator);
-    vm.getCTIStub(virtualCallThunkGenerator);
-    vm.getCTIStub(virtualConstructThunkGenerator);
+    if (mode == DFGMode) {
+        vm.getCTIStub(linkCallThunkGenerator);
+        vm.getCTIStub(linkConstructThunkGenerator);
+        vm.getCTIStub(linkClosureCallThunkGenerator);
+        vm.getCTIStub(virtualCallThunkGenerator);
+        vm.getCTIStub(virtualConstructThunkGenerator);
+    } else {
+        vm.getCTIStub(linkCallThatPreservesRegsThunkGenerator);
+        vm.getCTIStub(linkConstructThatPreservesRegsThunkGenerator);
+        vm.getCTIStub(linkClosureCallThatPreservesRegsThunkGenerator);
+        vm.getCTIStub(virtualCallThatPreservesRegsThunkGenerator);
+        vm.getCTIStub(virtualConstructThatPreservesRegsThunkGenerator);
+    }
     
     RefPtr<Plan> plan = adoptRef(
-        new Plan(codeBlock, mode, osrEntryBytecodeIndex, mustHandleValues));
+        new Plan(codeBlock, profiledDFGCodeBlock, mode, osrEntryBytecodeIndex, mustHandleValues));
     
-    if (worklist) {
+    bool enableConcurrentJIT;
+#if ENABLE(CONCURRENT_JIT)
+    enableConcurrentJIT = Options::enableConcurrentJIT();
+#else // ENABLE(CONCURRENT_JIT)
+    enableConcurrentJIT = false;
+#endif // ENABLE(CONCURRENT_JIT)
+    if (enableConcurrentJIT) {
+        Worklist* worklist = ensureGlobalWorklistFor(mode);
         plan->callback = callback;
         if (logCompilationChanges())
@@ -111 +127 @@
 #else // ENABLE(DFG_JIT)
 static CompilationResult compileImpl(
-    VM&, CodeBlock*, CompilationMode, unsigned, const Operands<JSValue>&,
-    PassRefPtr<DeferredCompilationCallback>, Worklist*)
+    VM&, CodeBlock*, CodeBlock*, CompilationMode, unsigned, const Operands<JSValue>&,
+    PassRefPtr<DeferredCompilationCallback>)
 {
     return CompilationFailed;
@@ -119 +135 @@
 
 CompilationResult compile(
-    VM& vm, CodeBlock* codeBlock, CompilationMode mode, unsigned osrEntryBytecodeIndex,
-    const Operands<JSValue>& mustHandleValues,
-    PassRefPtr<DeferredCompilationCallback> passedCallback, Worklist* worklist)
+    VM& vm, CodeBlock* codeBlock, CodeBlock* profiledDFGCodeBlock, CompilationMode mode,
+    unsigned osrEntryBytecodeIndex, const Operands<JSValue>& mustHandleValues,
+    PassRefPtr<DeferredCompilationCallback> passedCallback)
 {
     RefPtr<DeferredCompilationCallback> callback = passedCallback;
     CompilationResult result = compileImpl(
-        vm, codeBlock, mode, osrEntryBytecodeIndex, mustHandleValues, callback, worklist);
+        vm, codeBlock, profiledDFGCodeBlock, mode, osrEntryBytecodeIndex, mustHandleValues,
+        callback);
     if (result != CompilationDeferred)
         callback->compilationDidComplete(codeBlock, result);