Changeset 37325 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 5, 2008, 11:05:19 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-05 Maciej Stachowiak <​[email protected]>

Reviewed by Cameron Zwarich.

• fix releas-only test failures caused by the fix to bug 21375

• VM/Machine.cpp: (JSC::Machine::unwindCallFrame): Update ExecState while unwinding call frames; it now matters more to have a still-valid ExecState, since dynamicGlobalObject will make use of the ExecState's scope chain.
• VM/Machine.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/Machine.cpp (modified) (2 diffs)
• VM/Machine.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-10-05  Maciej Stachowiak  <[email protected]>
+
+        Reviewed by Cameron Zwarich.
+        
+        - fix releas-only test failures caused by the fix to bug 21375
+
+        * VM/Machine.cpp:
+        (JSC::Machine::unwindCallFrame): Update ExecState while unwinding call frames;
+        it now matters more to have a still-valid ExecState, since dynamicGlobalObject
+        will make use of the ExecState's scope chain.
+        * VM/Machine.h:
+
 2008-10-05  Cameron Zwarich  <[email protected]>
 

trunk/JavaScriptCore/VM/Machine.cpp

@@ -756 +756 @@
 //#endif
 
-NEVER_INLINE bool Machine::unwindCallFrame(ExecState* exec, JSValue* exceptionValue, const Instruction*& vPC, CodeBlock*& codeBlock, Register*& r)
+NEVER_INLINE bool Machine::unwindCallFrame(ExecState*& exec, JSValue* exceptionValue, const Instruction*& vPC, CodeBlock*& codeBlock, Register*& r)
 {
     CodeBlock* oldCodeBlock = codeBlock;
@@ -793 +793 @@
     void* returnPC = r[RegisterFile::ReturnPC].v();
     r = r[RegisterFile::CallerRegisters].r();
+    exec = CallFrame::create(r);
     if (isHostCallFrame(r))
         return false;

trunk/JavaScriptCore/VM/Machine.h

@@ -263 +263 @@
         NEVER_INLINE ScopeChainNode* createExceptionScope(ExecState* exec, const Instruction* vPC, Register* r);
 
-        NEVER_INLINE bool unwindCallFrame(ExecState*, JSValue*, const Instruction*&, CodeBlock*&, Register*&);
+        NEVER_INLINE bool unwindCallFrame(ExecState*&, JSValue*, const Instruction*&, CodeBlock*&, Register*&);
         NEVER_INLINE Instruction* throwException(ExecState*, JSValue*&, const Instruction*, Register*&, bool);
         NEVER_INLINE bool resolveBaseAndFunc(ExecState* exec, Instruction* vPC, Register* r, JSValue*& exceptionValue);