Changeset 107860 in webkit for trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp

Timestamp:

Feb 15, 2012, 5:29:12 PM (14 years ago)

Author:

[email protected]

Message:

Ensure that the DFG JIT always plants a CodeOrigin when making calls
​https://bugs.webkit.org/show_bug.cgi?id=78763

Reviewed by Gavin Barraclough.

Make all calls plant a CodeOrigin prior to the actual
call. Also clobbers the Interpreter with logic to ensure
that the interpreter always plants a bytecode offset.

• dfg/DFGJITCompiler.cpp:

(JSC::DFG::JITCompiler::link):
(JSC::DFG::JITCompiler::compileFunction):

• dfg/DFGJITCompiler.h:

(CallBeginToken):
(JSC::DFG::JITCompiler::beginJSCall):
(JSC::DFG::JITCompiler::beginCall):

• dfg/DFGRepatch.cpp:

(JSC::DFG::tryBuildGetByIDList):

• dfg/DFGSpeculativeJIT.h:

(JSC::DFG::SpeculativeJIT::appendCallWithExceptionCheck):

• dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::emitCall):

• dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::emitCall):

• interpreter/AbstractPC.cpp:

(JSC::AbstractPC::AbstractPC):

• interpreter/CallFrame.cpp:

(JSC::CallFrame::trueCallFrame):

• interpreter/CallFrame.h:

(JSC::ExecState::bytecodeOffsetForNonDFGCode):
(ExecState):
(JSC::ExecState::setBytecodeOffsetForNonDFGCode):
(JSC::ExecState::codeOriginIndexForDFG):

File:

• trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp

@@ -97 +97 @@
         ReturnAddressPtr currentReturnPC = pc.jitReturnAddress();
         
-        if (!machineCodeBlock->codeOriginForReturn(currentReturnPC, codeOrigin))
-            return this; // Not currently in inlined code.
+        bool hasCodeOrigin = machineCodeBlock->codeOriginForReturn(currentReturnPC, codeOrigin);
+        ASSERT_UNUSED(hasCodeOrigin, hasCodeOrigin);
     } else {
-        unsigned index = codeOriginIndexForDFGWithInlining();
-        if (index == UINT_MAX)
-            return this; // Not currently in inlined code.
-        
+        unsigned index = codeOriginIndexForDFG();
         codeOrigin = machineCodeBlock->codeOrigin(index);
     }
+
+    if (!codeOrigin.inlineCallFrame)
+        return this; // Not currently in inlined code.
     
     for (InlineCallFrame* inlineCallFrame = codeOrigin.inlineCallFrame; inlineCallFrame;) {