Changeset 105894 in webkit for trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

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/bytecode/CodeBlock.h (modified) (1 diff)

trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

@@ -670 +670 @@
         }
         
-        CodeOrigin codeOriginForReturn(ReturnAddressPtr returnAddress)
-        {
-            ASSERT(hasCodeOrigins());
-            return binarySearch<CodeOriginAtCallReturnOffset, unsigned, getCallReturnOffsetForCodeOrigin>(codeOrigins().begin(), codeOrigins().size(), getJITCode().offsetOf(returnAddress.value()))->codeOrigin;
+        bool codeOriginForReturn(ReturnAddressPtr returnAddress, CodeOrigin& codeOrigin)
+        {
+            if (!hasCodeOrigins())
+                return false;
+            unsigned offset = getJITCode().offsetOf(returnAddress.value());
+            CodeOriginAtCallReturnOffset* entry = binarySearch<CodeOriginAtCallReturnOffset, unsigned, getCallReturnOffsetForCodeOrigin>(codeOrigins().begin(), codeOrigins().size(), offset, WTF::KeyMustNotBePresentInArray);
+            if (entry->callReturnOffset != offset)
+                return false;
+            codeOrigin = entry->codeOrigin;
+            return true;
         }