Changeset 115861 in webkit for trunk/Source/JavaScriptCore/interpreter/CallFrame.h

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/CallFrame.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/interpreter/CallFrame.h

@@ -172 +172 @@
         {
             ASSERT(callerFrame); // Use noCaller() rather than 0 for the outer host call frame caller.
-            ASSERT(callerFrame == noCaller() || callerFrame->removeHostCallFrameFlag()->registerFile()->commitEnd() >= this);
+            ASSERT(callerFrame == noCaller() || callerFrame->removeHostCallFrameFlag()->registerFile()->end() >= this);
 
             setCodeBlock(codeBlock);
@@ -255 +255 @@
         CallFrame* trueCallFrameFromVMCode() { return trueCallFrame(AbstractPC()); }
 
-        Register* startOfReusableRegisterFile()
-        {
-            CallFrame* result = globalData().topCallFrame;
-            if (result == noCaller() || result == registerFile()->begin())
-                return registerFile()->begin();
-            return result->frameExtent();
-        }
-        
     private:
         static const intptr_t HostCallFrameFlag = 1;
@@ -268 +260 @@
         static const int s_firstArgumentOffset = s_thisArgumentOffset - 1;
 
+#ifndef NDEBUG
         RegisterFile* registerFile();
-
+#endif
 #if ENABLE(DFG_JIT)
         bool isInlineCallFrameSlow();