Changeset 79904 in webkit for trunk/Source/JavaScriptCore/jit/JITStubs.cpp

Timestamp:

Feb 28, 2011, 1:05:22 PM (14 years ago)

Author:

[email protected]

Message:

2011-02-28 Oliver Hunt <​[email protected]>

Reviewed by Gavin Barraclough.

Make ScopeChainNode GC allocated
​https://bugs.webkit.org/show_bug.cgi?id=55283

Simplify lifetime and other issues with the scopechain
by making it gc allocated. This allows us to simplify
function exit and unwinding, as well as making the
current iterative refcounting go away.

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• bytecode/CodeBlock.cpp: (JSC::CodeBlock::createActivation):
• bytecode/StructureStubInfo.cpp:
• bytecompiler/BytecodeGenerator.cpp: (JSC::BytecodeGenerator::generate): (JSC::BytecodeGenerator::BytecodeGenerator): (JSC::BytecodeGenerator::emitJumpIfNotFunctionCall): (JSC::BytecodeGenerator::emitJumpIfNotFunctionApply):
• bytecompiler/BytecodeGenerator.h:
• debugger/Debugger.cpp: (JSC::Recompiler::operator()):
• debugger/DebuggerCallFrame.h: (JSC::DebuggerCallFrame::scopeChain):
• interpreter/CachedCall.h: (JSC::CachedCall::CachedCall):
• interpreter/CallFrame.h:
• interpreter/Interpreter.cpp: (JSC::depth): (JSC::Interpreter::unwindCallFrame): (JSC::Interpreter::throwException): (JSC::Interpreter::execute): (JSC::Interpreter::executeCall): (JSC::Interpreter::executeConstruct): (JSC::Interpreter::privateExecute):
• jit/JITCall.cpp: (JSC::JIT::compileOpCallInitializeCallFrame): (JSC::JIT::compileOpCall):
• jit/JITCall32_64.cpp: (JSC::JIT::compileOpCallInitializeCallFrame): (JSC::JIT::emit_op_ret): (JSC::JIT::emit_op_ret_object_or_this): (JSC::JIT::compileOpCall):
• jit/JITOpcodes.cpp: (JSC::JIT::emit_op_end): (JSC::JIT::emit_op_ret): (JSC::JIT::emit_op_ret_object_or_this):
• jit/JITOpcodes32_64.cpp: (JSC::JIT::emit_op_end):
• jit/JITStubs.cpp: (JSC::DEFINE_STUB_FUNCTION):
• jit/JITStubs.h:
• runtime/ArgList.cpp:
• runtime/Completion.cpp: (JSC::evaluate):
• runtime/Completion.h:
• runtime/DateConversion.cpp:
• runtime/Executable.cpp: (JSC::EvalExecutable::compileInternal): (JSC::ProgramExecutable::compileInternal): (JSC::FunctionExecutable::compileForCallInternal): (JSC::FunctionExecutable::compileForConstructInternal):
• runtime/FunctionConstructor.cpp: (JSC::constructFunction):
• runtime/GCActivityCallbackCF.cpp:
• runtime/Identifier.cpp:
• runtime/JSCell.h:
• runtime/JSChunk.cpp: Added.
• runtime/JSChunk.h: Added.
• runtime/JSFunction.cpp: (JSC::JSFunction::JSFunction): (JSC::JSFunction::markChildren): (JSC::JSFunction::getCallData): (JSC::JSFunction::getOwnPropertySlot): (JSC::JSFunction::getConstructData):
• runtime/JSFunction.h: (JSC::JSFunction::scope): (JSC::JSFunction::setScope):
• runtime/JSGlobalData.cpp: (JSC::JSGlobalData::JSGlobalData):
• runtime/JSGlobalData.h:
• runtime/JSGlobalObject.cpp: (JSC::JSGlobalObject::init): (JSC::JSGlobalObject::markChildren):
• runtime/JSGlobalObject.h: (JSC::JSGlobalObject::JSGlobalObjectData::JSGlobalObjectData): (JSC::JSGlobalObject::globalScopeChain):
• runtime/JSGlobalObjectFunctions.cpp: (JSC::globalFuncEval):
• runtime/JSLock.cpp:
• runtime/JSNumberCell.cpp:
• runtime/JSZombie.cpp:
• runtime/MarkedBlock.cpp:
• runtime/MarkedSpace.cpp:
• runtime/PropertyNameArray.cpp:
• runtime/ScopeChain.cpp: (JSC::ScopeChainNode::print): (JSC::ScopeChainNode::localDepth): (JSC::ScopeChainNode::markChildren):
• runtime/ScopeChain.h: (JSC::ScopeChainNode::ScopeChainNode): (JSC::ScopeChainNode::createStructure): (JSC::ScopeChainNode::push): (JSC::ScopeChainNode::pop): (JSC::ScopeChainIterator::ScopeChainIterator): (JSC::ScopeChainIterator::operator*): (JSC::ScopeChainIterator::operator->): (JSC::ScopeChainIterator::operator++): (JSC::ScopeChainNode::begin): (JSC::ScopeChainNode::end): (JSC::ExecState::globalData): (JSC::ExecState::lexicalGlobalObject): (JSC::ExecState::globalThisValue):
• runtime/ScopeChainMark.h:
• wtf/DateMath.cpp:

2011-02-28 Oliver Hunt <​[email protected]>

Reviewed by Gavin Barraclough.

Make ScopeChainNode GC allocated
​https://bugs.webkit.org/show_bug.cgi?id=55283

Update WebCore to deal with the absence of the ScopeChain
class.

• ForwardingHeaders/runtime/ScopeChain.h: Added.
• bindings/js/JSHTMLElementCustom.cpp: (WebCore::JSHTMLElement::pushEventHandlerScope):
• bindings/js/JSJavaScriptCallFrameCustom.cpp: (WebCore::JSJavaScriptCallFrame::scopeChain): (WebCore::JSJavaScriptCallFrame::scopeType):
• bindings/js/JSLazyEventListener.cpp: (WebCore::JSLazyEventListener::initializeJSFunction):
• bindings/js/JSMainThreadExecState.h: (WebCore::JSMainThreadExecState::evaluate):
• bindings/js/JSNodeCustom.cpp: (WebCore::JSNode::pushEventHandlerScope):
• bindings/js/JavaScriptCallFrame.cpp: (WebCore::JavaScriptCallFrame::scopeChain):
• bindings/js/JavaScriptCallFrame.h:
• bindings/scripts/CodeGeneratorJS.pm:
• bridge/c/c_class.cpp:
• bridge/c/c_runtime.cpp:
• bridge/jni/JNIBridge.cpp:
• bridge/qt/qt_runtime.cpp: (JSC::Bindings::QtConnectionObject::execute):
• plugins/PluginViewNone.cpp:

2011-02-28 Oliver Hunt <​[email protected]>

Reviewed by Gavin Barraclough.

Make ScopeChainNode GC allocated
​https://bugs.webkit.org/show_bug.cgi?id=55283

More updates for the absence of the ScopeChain class

• WebView/WebScriptDebugDelegate.mm: (-[WebScriptCallFrame scopeChain]):

File:

• trunk/Source/JavaScriptCore/jit/JITStubs.cpp (modified) (12 diffs)

trunk/Source/JavaScriptCore/jit/JITStubs.cpp

@@ -1175 +1175 @@
         structure = asObject(proto)->inheritorID();
     else
-        structure = constructor->scope().node()->globalObject->emptyObjectStructure();
+        structure = constructor->scope()->globalObject->emptyObjectStructure();
     JSValue result = constructEmptyObject(callFrame, structure);
 
@@ -1203 +1203 @@
     CHECK_FOR_EXCEPTION_AT_END();
     return JSValue::encode(result);
-}
-
-DEFINE_STUB_FUNCTION(void, op_end)
-{
-    STUB_INIT_STACK_FRAME(stackFrame);
-
-    ScopeChainNode* scopeChain = stackFrame.callFrame->scopeChain();
-    ASSERT(scopeChain->refCount > 1);
-    scopeChain->deref();
 }
 
@@ -1848 +1839 @@
     ASSERT(!function->isHostFunction());
     FunctionExecutable* executable = function->jsExecutable();
-    ScopeChainNode* callDataScopeChain = function->scope().node();
+    ScopeChainNode* callDataScopeChain = function->scope();
     JSObject* error = executable->compileForCall(stackFrame.callFrame, callDataScopeChain);
     if (error) {
@@ -1869 +1860 @@
     ASSERT(!function->isHostFunction());
     FunctionExecutable* executable = function->jsExecutable();
-    ScopeChainNode* callDataScopeChain = function->scope().node();
+    ScopeChainNode* callDataScopeChain = function->scope();
     JSObject* error = executable->compileForConstruct(stackFrame.callFrame, callDataScopeChain);
     if (error) {
@@ -1930 +1921 @@
     callFrame->setArgumentCountIncludingThis(argCount);
     callFrame->setCallee(callee);
-    callFrame->setScopeChain(callee->scope().node());
+    callFrame->setScopeChain(callee->scope());
     callFrame->setReturnPC(pc.value());
 
@@ -1989 +1980 @@
     callFrame->setArgumentCountIncludingThis(argCount);
     callFrame->setCallee(callee);
-    callFrame->setScopeChain(callee->scope().node());
+    callFrame->setScopeChain(callee->scope());
     callFrame->setReturnPC(pc.value());
 
@@ -2010 +2001 @@
     else {
         FunctionExecutable* functionExecutable = static_cast<FunctionExecutable*>(executable);
-        JSObject* error = functionExecutable->compileForCall(callFrame, callee->scope().node());
+        JSObject* error = functionExecutable->compileForCall(callFrame, callee->scope());
         if (error) {
             callFrame->globalData().exception = createStackOverflowError(callFrame);
@@ -2044 +2035 @@
     else {
         FunctionExecutable* functionExecutable = static_cast<FunctionExecutable*>(executable);
-        JSObject* error = functionExecutable->compileForConstruct(callFrame, callee->scope().node());
+        JSObject* error = functionExecutable->compileForConstruct(callFrame, callee->scope());
         if (error) {
             throwStackOverflowError(callFrame, stackFrame.globalData, ReturnAddressPtr(callFrame->returnPC()), STUB_RETURN_ADDRESS);
@@ -2071 +2062 @@
 
     JSActivation* activation = new (stackFrame.globalData) JSActivation(stackFrame.callFrame, static_cast<FunctionExecutable*>(stackFrame.callFrame->codeBlock()->ownerExecutable()));
-    stackFrame.callFrame->setScopeChain(stackFrame.callFrame->scopeChain()->copy()->push(activation));
+    stackFrame.callFrame->setScopeChain(stackFrame.callFrame->scopeChain()->push(activation));
     return activation;
 }
@@ -2173 +2164 @@
     ASSERT(*stackFrame.enabledProfilerReference);
     (*stackFrame.enabledProfilerReference)->didExecute(stackFrame.callFrame, stackFrame.args[0].jsValue());
-}
-
-DEFINE_STUB_FUNCTION(void, op_ret_scopeChain)
-{
-    STUB_INIT_STACK_FRAME(stackFrame);
-
-    ASSERT(stackFrame.callFrame->codeBlock()->needsFullScopeChain());
-    stackFrame.callFrame->scopeChain()->deref();
 }
 
@@ -3009 +2992 @@
     if (!function->name().isNull()) {
         JSStaticScopeObject* functionScopeObject = new (callFrame) JSStaticScopeObject(callFrame, function->name(), func, ReadOnly | DontDelete);
-        func->scope().push(functionScopeObject);
+        func->setScope(callFrame->globalData(), func->scope()->push(functionScopeObject));
     }
 
@@ -3119 +3102 @@
     Register* argv = newCallFrame - RegisterFile::CallFrameHeaderSize - argCount;
     JSValue baseValue = argv[0].jsValue();
-    JSGlobalObject* globalObject = callFrame->scopeChain()->globalObject;
+    JSGlobalObject* globalObject = callFrame->scopeChain()->globalObject.get();
 
     if (baseValue == globalObject && funcVal == globalObject->evalFunction()) {