Changeset 107308 in webkit

Timestamp:

Feb 9, 2012, 4:36:23 PM (15 years ago)

Author:

Lucas Forschler

Message:

Merged r106596.

Location:

branches/safari-534.54-branch

Files:

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

branches/safari-534.54-branch/LayoutTests/ChangeLog

@@ +1 @@
+2011-02-09  Lucas Forschler  <lforschler@apple.com>
+
+    Merge 106596
+
+    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):
+
 2011-02-07  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-534.54-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-02-09  Lucas Forschler  <lforschler@apple.com>
+
+    Merge 106596
+
+    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-07  Gavin Barraclough  <barraclough@apple.com>
 

branches/safari-534.54-branch/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -5103 +5103 @@
     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();