Changeset 106596 in webkit

Timestamp:

Feb 2, 2012, 3:18:13 PM (15 years ago)

Author:

fpizlo@apple.com

Message:

retrieveCallerFromVMCode should call trueCallerFrame
​https://bugs.webkit.org/show_bug.cgi?id=77684

Source/JavaScriptCore:

Reviewed by Oliver Hunt.

• interpreter/Interpreter.cpp:

(JSC::Interpreter::retrieveCallerFromVMCode):

LayoutTests:

Rubber stamped by Oliver Hunt.

• fast/js/dfg-inline-function-dot-caller-expected.txt: Added.
• fast/js/dfg-inline-function-dot-caller.html: Added.
• fast/js/script-tests/dfg-inline-function-dot-caller.js: Added.

(resultArray):
(object.nonInlineable.nonInlineable.if):
(object.nonInlineable):
(object.inlineable):
(makeInlinableCall):
(g):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/dfg-inline-function-dot-caller-expected.txt (added)
• LayoutTests/fast/js/dfg-inline-function-dot-caller.html (added)
• LayoutTests/fast/js/script-tests/dfg-inline-function-dot-caller.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/interpreter/Interpreter.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-02  Filip Pizlo  <fpizlo@apple.com>
+
+        retrieveCallerFromVMCode should call trueCallerFrame
+        https://bugs.webkit.org/show_bug.cgi?id=77684
+
+        Rubber stamped by Oliver Hunt.
+
+        * fast/js/dfg-inline-function-dot-caller-expected.txt: Added.
+        * fast/js/dfg-inline-function-dot-caller.html: Added.
+        * fast/js/script-tests/dfg-inline-function-dot-caller.js: Added.
+        (resultArray):
+        (object.nonInlineable.nonInlineable.if):
+        (object.nonInlineable):
+        (object.inlineable):
+        (makeInlinableCall):
+        (g):
+
 2012-02-02  Chris Marrin  <cmarrin@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-02-02  Filip Pizlo  <fpizlo@apple.com>
+
+        retrieveCallerFromVMCode should call trueCallerFrame
+        https://bugs.webkit.org/show_bug.cgi?id=77684
+
+        Reviewed by Oliver Hunt.
+
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::retrieveCallerFromVMCode):
+
 2012-02-02  Kalev Lember  <kalevlember@gmail.com>
 

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -5127 +5127 @@
     if (!functionCallFrame)
         return jsNull();
-
-    CallFrame* callerFrame = functionCallFrame->callerFrame();
-    if (callerFrame->hasHostCallFrameFlag())
+    
+    if (functionCallFrame->callerFrame()->hasHostCallFrameFlag())
         return jsNull();
+
+    CallFrame* callerFrame = functionCallFrame->trueCallerFrame();
 
     JSValue caller = callerFrame->callee();