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

Timestamp:

Jan 25, 2012, 10:27:43 AM (14 years ago)

Author:

[email protected]

Message:

Inlining breaks call frame walking when the walking is done from outside the inlinee,
but inside a code block that had inlining
​https://bugs.webkit.org/show_bug.cgi?id=76978
<rdar://problem/10720904>

Reviewed by Oliver Hunt.

Source/JavaScriptCore:

• bytecode/CodeBlock.h:

(JSC::CodeBlock::codeOriginForReturn):

• interpreter/CallFrame.cpp:

(JSC::CallFrame::trueCallerFrame):

LayoutTests:

• fast/js/dfg-inline-arguments-use-from-uninlined-code-expected.txt: Added.
• fast/js/dfg-inline-arguments-use-from-uninlined-code.html: Added.
• fast/js/script-tests/dfg-inline-arguments-use-from-uninlined-code.js: Added.

(foo):
(fuzz):
(bar):
(baz):

File:

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

trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp

@@ -92 +92 @@
     // caller, and rematerialize it. Do so for the entire inline stack.
     
-    CodeOrigin codeOrigin = machineCaller->codeBlock()->codeOriginForReturn(returnPC());
+    ReturnAddressPtr currentReturnPC = returnPC();
+    CodeBlock* machineCodeBlock = machineCaller->codeBlock();
+    
+    CodeOrigin codeOrigin;
+    if (!machineCodeBlock->codeOriginForReturn(currentReturnPC, codeOrigin))
+        return machineCaller; // Not currently in inlined code, so machineCaller == trueCaller
     
     for (InlineCallFrame* inlineCallFrame = codeOrigin.inlineCallFrame; inlineCallFrame;) {