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

Timestamp:

Jun 22, 2011, 1:07:37 PM (14 years ago)

Author:

[email protected]

Message:

Removed the conceit that global variables are local variables when running global code
​https://bugs.webkit.org/show_bug.cgi?id=63106

Reviewed by Oliver Hunt.

Source/JavaScriptCore:

This is required for write barrier correctness.

SunSpider reports about a 0.5% regression, mostly from bitops-bitwise-and.js.
I was able to reduce the regression with a tiny peephole optimization in
the bytecompiler, but not eliminate it. I'm committing this assuming
that turning on generational GC will win back at least 0.5%.

(FWIW, the DFG JIT can easily eliminate any regression by sharing loads of
the global object's var storage. I considered doing the same kind of
optimization in the existing JIT, but it seemed like moving in the wrong
direction.)

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::addGlobalVar):
(JSC::BytecodeGenerator::BytecodeGenerator): Don't give global variables
negative indices, since they're no longer negatively offset from the
current stack frame.

Do give global variables monotonically increasing positive indices, since
that's much easier to work with.

Don't limit the number of optimizable global variables, since it's no
longer limited by the register file, since they're no longer stored in
the register file.

(JSC::BytecodeGenerator::registerFor): Global code never has any local
registers because a var in global code is actually a property of the
global object.

(JSC::BytecodeGenerator::constRegisterFor): Ditto.

(JSC::BytecodeGenerator::emitResolve): Did a tiny bit of constant
propagation and dead code elimination to speed up our compiles and
reduce WTFs / minute.

• bytecompiler/BytecodeGenerator.h:

(JSC::BytecodeGenerator::registerFor): Removed special handling of globals.

(JSC::BytecodeGenerator::shouldOptimizeLocals): Don't optimize locals in
global code, since there are none.

(JSC::BytecodeGenerator::canOptimizeNonLocals): Do optimize non-locals
in global code (i.e., global vars), since there are some.

• interpreter/Interpreter.cpp:

(JSC::Interpreter::callEval):
(JSC::Interpreter::Interpreter):
(JSC::Interpreter::dumpRegisters):
(JSC::Interpreter::execute):

• interpreter/Interpreter.h: Updated for deleted / renamed code.

• interpreter/RegisterFile.cpp:

(JSC::RegisterFile::gatherConservativeRoots):
(JSC::RegisterFile::releaseExcessCapacity): Updated for deleted / renamed
data members.

• interpreter/RegisterFile.h:

(JSC::RegisterFile::begin):
(JSC::RegisterFile::size):
(JSC::RegisterFile::RegisterFile):
(JSC::RegisterFile::shrink): Removed all code and comments dealing with
global variables stored in the register file.

(JSC::RegisterFile::grow): Updated for same.

Also, a slight correctness fix: Test the VM commit end, and not just the
in-use end, when checking for stack overflow. In theory, it's invalid to
commit past the end of your allocation, even if you never touch that
memory. This makes the usable size of the stack slightly smaller. No test
because we don't know of any case in practice where this crashes.

• runtime/JSGlobalData.cpp:

(JSC::JSGlobalData::JSGlobalData): Updated for changes above.

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::resizeRegisters):
(JSC::JSGlobalObject::addStaticGlobals):

• runtime/JSGlobalObject.h: Simplified globals to have monotonically

increasing indexes, always located in our external storage.

LayoutTests:

• fast/js/recursion-limit-equal-expected.txt: Updated to reflect slightly

changed recursion limit.

File:

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

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -410 +410 @@
         return throwError(callFrame, exceptionValue);
 
-    return callFrame->globalData().interpreter->execute(eval, callFrame, callFrame->uncheckedR(codeBlock->thisRegister()).jsValue().toThisObject(callFrame), callFrame->registers() - registerFile->start() + registerOffset, scopeChain);
+    return callFrame->globalData().interpreter->execute(eval, callFrame, callFrame->uncheckedR(codeBlock->thisRegister()).jsValue().toThisObject(callFrame), callFrame->registers() - registerFile->begin() + registerOffset, scopeChain);
 }
 
-Interpreter::Interpreter(JSGlobalData& globalData)
+Interpreter::Interpreter()
     : m_sampleEntryDepth(0)
     , m_reentryDepth(0)
-    , m_registerFile(globalData)
 {
 #if ENABLE(COMPUTED_GOTO_INTERPRETER)
@@ -446 +445 @@
 
     CodeBlock* codeBlock = callFrame->codeBlock();
-    RegisterFile* registerFile = &callFrame->scopeChain()->globalObject->globalData().interpreter->registerFile();
     const Register* it;
     const Register* end;
     JSValue v;
 
-    if (codeBlock->codeType() == GlobalCode) {
-        it = registerFile->lastGlobal();
-        end = it + registerFile->numGlobals();
-        while (it != end) {
-            v = (*it).jsValue();
-#if USE(JSVALUE32_64)
-            printf("[global var]               | %10p | %-16s 0x%llx \n", it, v.description(), JSValue::encode(v));
-#else
-            printf("[global var]               | %10p | %-16s %p \n", it, v.description(), JSValue::encode(v));
-#endif
-            ++it;
-        }
-        printf("-----------------------------------------------------------------------------\n");
-    }
-    
     it = callFrame->registers() - RegisterFile::CallFrameHeaderSize - codeBlock->m_numParameters;
     v = (*it).jsValue();
@@ -827 +810 @@
         return checkedReturn(throwStackOverflowError(callFrame));
 
-    JSGlobalObject* lastGlobalObject = m_registerFile.globalObject();
-    JSGlobalObject* globalObject = callFrame->dynamicGlobalObject();
-    globalObject->copyGlobalsTo(m_registerFile);
-
     CallFrame* newCallFrame = CallFrame::create(oldEnd + codeBlock->m_numParameters + RegisterFile::CallFrameHeaderSize);
     ASSERT(codeBlock->m_numParameters == 1); // 1 parameter for 'this'.
@@ -857 +836 @@
     if (*profiler)
         (*profiler)->didExecute(callFrame, program->sourceURL(), program->lineNo());
-
-    if (m_reentryDepth && lastGlobalObject && globalObject != lastGlobalObject)
-        lastGlobalObject->copyGlobalsTo(m_registerFile);
 
     m_registerFile.shrink(oldEnd);
@@ -1205 +1181 @@
 
     Register* oldEnd = m_registerFile.end();
-    Register* newEnd = m_registerFile.start() + globalRegisterOffset + codeBlock->m_numCalleeRegisters;
+    Register* newEnd = m_registerFile.begin() + globalRegisterOffset + codeBlock->m_numCalleeRegisters;
     if (!m_registerFile.grow(newEnd)) {
         if (pushedScope)
@@ -1212 +1188 @@
     }
 
-    CallFrame* newCallFrame = CallFrame::create(m_registerFile.start() + globalRegisterOffset);
+    CallFrame* newCallFrame = CallFrame::create(m_registerFile.begin() + globalRegisterOffset);
 
     ASSERT(codeBlock->m_numParameters == 1); // 1 parameter for 'this'.