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

Timestamp:

Apr 26, 2012, 5:07:11 PM (13 years ago)

Author:

[email protected]

Message:

Remove RegisterFile::end()/m_end
​https://bugs.webkit.org/show_bug.cgi?id=85011

Reviewed by Gavin Barraclough.

Source/JavaScriptCore:

Get rid of end() and m_end from RegisterFile. From now on
we only care about the end of the committed region when calling
code. When re-entering the VM we now plant the new CallFrame
immediately after whatever the current topCallFrame is. This
required adding a routine to CallFrame to determine exactly what
we should be doing (in the absence of an existing CallFrame, we
can't reason about the frameExtent() so we check for that).

This also now means that the GC only marks the portion of the
RegisterFile that is actually in use, and that VM re-entry doesn't
exhaust the RegisterFile as rapidly.

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

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

• interpreter/CallFrame.h:

(JSC::ExecState::init):
(JSC::ExecState::startOfReusableRegisterFile):
(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::commitEnd):
(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:

Now that we recurse on the top of the used portion of the stack we
can provide an error message even when the stack is completely full.

Also made sure we were consistent in which callframe we used when
creating stack overflow errors.

• 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()->end() >= this);
+            ASSERT(callerFrame == noCaller() || callerFrame->removeHostCallFrameFlag()->registerFile()->commitEnd() >= 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;
@@ -260 +268 @@
         static const int s_firstArgumentOffset = s_thisArgumentOffset - 1;
 
-#ifndef NDEBUG
         RegisterFile* registerFile();
-#endif
+
 #if ENABLE(DFG_JIT)
         bool isInlineCallFrameSlow();