Changeset 251903 in webkit for trunk/Source/JavaScriptCore/jit/JITOperations.cpp

Timestamp:

Oct 31, 2019, 8:22:18 PM (6 years ago)

Author:

[email protected]

Message:

[JSC] Remove metadata(CallFrame*) accessor
​https://bugs.webkit.org/show_bug.cgi?id=203712

Reviewed by Tadeu Zagallo.

We should pass CodeBlock* explicitly to remove unnecessary use of CallFrame*, which is very error-prone.

• dfg/DFGOSREntry.cpp:

(JSC::DFG::prepareCatchOSREntry):

• dfg/DFGOSREntry.h:
• generator/Metadata.rb:
• jit/JITOperations.cpp:

File:

• trunk/Source/JavaScriptCore/jit/JITOperations.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/jit/JITOperations.cpp

@@ -1733 +1733 @@
     BytecodeIndex bytecodeIndex = BytecodeIndex::fromBits(bytecodeIndexBits);
 
-    CodeBlock* optimizedReplacement = callFrame->codeBlock()->replacement();
-    if (UNLIKELY(!optimizedReplacement))
-        return nullptr;
-
-    switch (optimizedReplacement->jitType()) {
-    case JITType::DFGJIT:
-    case JITType::FTLJIT: {
-        MacroAssemblerCodePtr<ExceptionHandlerPtrTag> entry = DFG::prepareCatchOSREntry(vm, callFrame, optimizedReplacement, bytecodeIndex);
-        return entry.executableAddress<char*>();
-    }
-    default:
-        break;
-    }
-    return nullptr;
-}
-
-char* JIT_OPERATION operationTryOSREnterAtCatchAndValueProfile(VM* vmPointer, uint32_t bytecodeIndexBits)
-{
-    VM& vm = *vmPointer;
-    CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
-    JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
-    BytecodeIndex bytecodeIndex = BytecodeIndex::fromBits(bytecodeIndexBits);
-
     CodeBlock* codeBlock = callFrame->codeBlock();
     CodeBlock* optimizedReplacement = codeBlock->replacement();
@@ -1764 +1741 @@
     case JITType::DFGJIT:
     case JITType::FTLJIT: {
-        MacroAssemblerCodePtr<ExceptionHandlerPtrTag> entry = DFG::prepareCatchOSREntry(vm, callFrame, optimizedReplacement, bytecodeIndex);
+        MacroAssemblerCodePtr<ExceptionHandlerPtrTag> entry = DFG::prepareCatchOSREntry(vm, callFrame, codeBlock, optimizedReplacement, bytecodeIndex);
+        return entry.executableAddress<char*>();
+    }
+    default:
+        break;
+    }
+    return nullptr;
+}
+
+char* JIT_OPERATION operationTryOSREnterAtCatchAndValueProfile(VM* vmPointer, uint32_t bytecodeIndexBits)
+{
+    VM& vm = *vmPointer;
+    CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
+    JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
+    BytecodeIndex bytecodeIndex = BytecodeIndex::fromBits(bytecodeIndexBits);
+
+    CodeBlock* codeBlock = callFrame->codeBlock();
+    CodeBlock* optimizedReplacement = codeBlock->replacement();
+    if (UNLIKELY(!optimizedReplacement))
+        return nullptr;
+
+    switch (optimizedReplacement->jitType()) {
+    case JITType::DFGJIT:
+    case JITType::FTLJIT: {
+        MacroAssemblerCodePtr<ExceptionHandlerPtrTag> entry = DFG::prepareCatchOSREntry(vm, callFrame, codeBlock, optimizedReplacement, bytecodeIndex);
         return entry.executableAddress<char*>();
     }