Changeset 115861 in webkit for trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

Timestamp:

May 2, 2012, 12:18:28 PM (13 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r115388.
​http://trac.webkit.org/changeset/115388
​https://bugs.webkit.org/show_bug.cgi?id=85011

This caused many weird performance problems, and needs to be
landed in pieces.

Source/JavaScriptCore:

• dfg/DFGOperations.cpp:
• heap/Heap.cpp:

(JSC::Heap::getConservativeRegisterRoots):
(JSC::Heap::markRoots):

• interpreter/CallFrame.cpp:

(JSC::CallFrame::dumpCaller):
(JSC):

• interpreter/CallFrame.h:

(JSC::ExecState::init):
(ExecState):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::execute):
(JSC::Interpreter::executeCall):
(JSC::Interpreter::executeConstruct):
(JSC::Interpreter::prepareForRepeatCall):
(JSC::Interpreter::privateExecute):

• interpreter/Interpreter.h:

(JSC::Interpreter::execute):

• interpreter/RegisterFile.cpp:

(JSC::RegisterFile::growSlowCase):
(JSC::RegisterFile::gatherConservativeRoots):

• interpreter/RegisterFile.h:

(JSC::RegisterFile::end):
(JSC::RegisterFile::size):
(JSC::RegisterFile::addressOfEnd):
(RegisterFile):
(JSC::RegisterFile::RegisterFile):
(JSC::RegisterFile::shrink):
(JSC::RegisterFile::grow):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):
(JSC::jitCompileFor):
(JSC::lazyLinkFor):

• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL):
(JSC::LLInt::handleHostCall):

• llint/LowLevelInterpreter.asm:
• runtime/CommonSlowPaths.h:

(JSC::CommonSlowPaths::arityCheckFor):

LayoutTests:

• fast/js/global-recursion-on-full-stack-expected.txt:
• fast/js/stack-trace-expected.txt:

File:

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

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -1209 +1209 @@
     CodeBlock* codeBlock = &program->generatedBytecode();
 
-    Register* oldEnd = callFrame->startOfReusableRegisterFile();
+    Register* oldEnd = m_registerFile.end();
     Register* newEnd = oldEnd + codeBlock->numParameters() + RegisterFile::CallFrameHeaderSize + codeBlock->m_numCalleeRegisters;
     if (!m_registerFile.grow(newEnd))
@@ -1258 +1258 @@
         return checkedReturn(throwStackOverflowError(callFrame));
 
-    Register* oldEnd = callFrame->startOfReusableRegisterFile();
+    Register* oldEnd = m_registerFile.end();
     ASSERT(callFrame->frameExtent() <= oldEnd || callFrame == callFrame->scopeChain()->globalObject->globalExec());
     int argCount = 1 + args.size(); // implicit "this" parameter
@@ -1355 +1355 @@
         return checkedReturn(throwStackOverflowError(callFrame));
 
-    Register* oldEnd = callFrame->startOfReusableRegisterFile();
+    Register* oldEnd = m_registerFile.end();
     int argCount = 1 + args.size(); // implicit "this" parameter
     size_t registerOffset = argCount + RegisterFile::CallFrameHeaderSize;
@@ -1457 +1457 @@
     }
 
-    Register* oldEnd = callFrame->startOfReusableRegisterFile();
+    Register* oldEnd = m_registerFile.end();
     size_t registerOffset = argumentCountIncludingThis + RegisterFile::CallFrameHeaderSize;
 
@@ -1583 +1583 @@
     }
 
+    Register* oldEnd = m_registerFile.end();
     Register* newEnd = m_registerFile.begin() + globalRegisterOffset + codeBlock->m_numCalleeRegisters;
     if (!m_registerFile.grow(newEnd)) {
@@ -1626 +1627 @@
         (*profiler)->didExecute(callFrame, eval->sourceURL(), eval->lineNo());
 
+    m_registerFile.shrink(oldEnd);
     if (pushedScope)
         scopeChain->pop();
@@ -4517 +4519 @@
             if (UNLIKELY(!callFrame)) {
                 callFrame = previousCallFrame;
-                *topCallFrameSlot = callFrame;
                 exceptionValue = createStackOverflowError(callFrame);
                 goto vm_throw;
@@ -4596 +4597 @@
             newCallFrame = slideRegisterWindowForCall(newCodeBlock, registerFile, newCallFrame, 0, argCount);
             if (UNLIKELY(!newCallFrame)) {
-                *topCallFrameSlot = callFrame;
                 exceptionValue = createStackOverflowError(callFrame);
                 goto vm_throw;
@@ -4918 +4918 @@
             if (UNLIKELY(!callFrame)) {
                 callFrame = previousCallFrame;
-                *topCallFrameSlot = callFrame;
                 exceptionValue = createStackOverflowError(callFrame);
                 goto vm_throw;