[Follow up] StackOverflow stack unwinding should stop at native frames.
authormark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 5 Sep 2015 01:23:03 +0000 (01:23 +0000)
committermark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 5 Sep 2015 01:23:03 +0000 (01:23 +0000)
https://bugs.webkit.org/show_bug.cgi?id=148749

Rubber stamped by Michael Saboff.

Speculative fix for jsc test failure.

* interpreter/Interpreter.cpp:
(JSC::Interpreter::unwind):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@189413 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/interpreter/Interpreter.cpp

index 89396a6..44145c8 100644 (file)
@@ -1,5 +1,17 @@
 2015-09-04  Mark Lam  <mark.lam@apple.com>
 
+        [Follow up] StackOverflow stack unwinding should stop at native frames.
+        https://bugs.webkit.org/show_bug.cgi?id=148749
+
+        Rubber stamped by Michael Saboff.
+
+        Speculative fix for jsc test failure.
+
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::unwind):
+
+2015-09-04  Mark Lam  <mark.lam@apple.com>
+
         StackOverflow stack unwinding should stop at native frames.
         https://bugs.webkit.org/show_bug.cgi?id=148749
 
index b3727f4..1f6773b 100644 (file)
@@ -672,6 +672,7 @@ NEVER_INLINE HandlerInfo* Interpreter::unwind(VM& vm, CallFrame*& callFrame, Exc
             return nullptr;
 
         callFrame = callFrame->callerFrame();
+        vm.topCallFrame = callFrame;
     }
 
     CodeBlock* codeBlock = callFrame->codeBlock();