Changeset 50916 in webkit for trunk/JavaScriptCore/interpreter/Interpreter.cpp

Timestamp:

Nov 12, 2009, 4:28:29 PM (16 years ago)

Author:

[email protected]

Message:

Rollout r50896 until i can work out why it causes failures.

File:

• trunk/JavaScriptCore/interpreter/Interpreter.cpp (modified) (2 diffs)

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -814 +814 @@
 
     Register* oldEnd = m_registerFile.end();
-    int argc = 1; // Implicit this argument
-    if (!m_registerFile.grow(m_registerFile.start() + globalRegisterOffset + argc)) {
+    Register* newEnd = m_registerFile.start() + globalRegisterOffset + codeBlock->m_numCalleeRegisters;
+    if (!m_registerFile.grow(newEnd)) {
         *exception = createStackOverflowError(callFrame);
         return jsNull();
@@ -821 +821 @@
 
     CallFrame* newCallFrame = CallFrame::create(m_registerFile.start() + globalRegisterOffset);
-    newCallFrame->r(0) = JSValue(thisObj);
-
-    newCallFrame = slideRegisterWindowForCall(codeBlock, &m_registerFile, newCallFrame, argc + RegisterFile::CallFrameHeaderSize, argc);
-    if (UNLIKELY(!newCallFrame)) {
-        *exception = createStackOverflowError(callFrame);
-        m_registerFile.shrink(oldEnd);
-        return jsNull();
-    }
+
     // a 0 codeBlock indicates a built-in caller
-    newCallFrame->init(codeBlock, 0, scopeChain, callFrame->addHostCallFrameFlag(), 0, argc, 0);
+    newCallFrame->r(codeBlock->thisRegister()) = JSValue(thisObj);
+    newCallFrame->init(codeBlock, 0, scopeChain, callFrame->addHostCallFrameFlag(), 0, 0, 0);
 
     if (codeBlock->needsFullScopeChain())