Changeset 80277 in webkit for trunk/Source/JavaScriptCore/runtime/JSActivation.cpp

Timestamp:

Mar 3, 2011, 1:24:14 PM (14 years ago)

Author:

[email protected]

Message:

2011-03-02 Geoffrey Garen <​[email protected]>

Reviewed by Darin Adler.

Moved all variable object storage inline -- upping the object size limit to 1K
​https://bugs.webkit.org/show_bug.cgi?id=55653

• JavaScriptCore.exp:
• bytecompiler/BytecodeGenerator.cpp:
• jit/JITOpcodes.cpp:
• runtime/Arguments.h:
• runtime/JSActivation.h: Removed out-of-line storage. Changed d-> to m_.

• runtime/JSCell.h: (JSC::JSCell::MarkedSpace::sizeClassFor): Added an imprecise size class to accomodate objects up to 1K.

• runtime/JSGlobalObject.cpp:
• runtime/JSGlobalObject.h: Removed out-of-line storage. Changed d-> to m_.

• runtime/JSObject.cpp: Don't ASSERT that JSFinalObject fills the maximum object size, since it doesn't anymore.

• runtime/JSStaticScopeObject.cpp:
• runtime/JSStaticScopeObject.h:
• runtime/JSVariableObject.h: Removed out-of-line storage. Changed d-> to m_.

• runtime/MarkedSpace.cpp: (JSC::MarkedSpace::MarkedSpace): (JSC::MarkedSpace::reset):
• runtime/MarkedSpace.h: Added an imprecise size class to accomodate objects up to 1K.

2011-03-02 Geoffrey Garen <​[email protected]>

Reviewed by Darin Adler.

Moved all variable object storage inline -- upping the object size limit to 1K
​https://bugs.webkit.org/show_bug.cgi?id=55653

• JSRun.cpp: (JSGlueGlobalObject::JSGlueGlobalObject):
• JSRun.h: (JSGlueGlobalObject::Flags): (JSGlueGlobalObject::userObjectStructure): Removed out-of-line storage. Changed d-> to m_.

2011-03-02 Geoffrey Garen <​[email protected]>

Reviewed by Darin Adler.

Moved all variable object storage inline -- upping the object size limit to 1K
​https://bugs.webkit.org/show_bug.cgi?id=55653

• bindings/js/JSDOMGlobalObject.cpp:
• bindings/js/JSDOMGlobalObject.h:
• bindings/js/JSDOMWindowBase.cpp:
• bindings/js/JSDOMWindowBase.h:
• bindings/js/JSDOMWindowCustom.h:
• bindings/js/JSWorkerContextBase.cpp: Removed out-of-line storage. Changed d-> to m_.

File:

• trunk/Source/JavaScriptCore/runtime/JSActivation.cpp (modified) (8 diffs)

trunk/Source/JavaScriptCore/runtime/JSActivation.cpp

@@ -41 +41 @@
 
 JSActivation::JSActivation(CallFrame* callFrame, NonNullPassRefPtr<FunctionExecutable> functionExecutable)
-    : Base(callFrame->globalData().activationStructure, new JSActivationData(functionExecutable, callFrame->registers()))
+    : Base(callFrame->globalData().activationStructure, functionExecutable->symbolTable(), callFrame->registers())
+    , m_functionExecutable(functionExecutable)
 {
     ASSERT(inherits(&s_info));
+
+    // We have to manually ref and deref the symbol table as JSVariableObjectData
+    // doesn't know about SharedSymbolTable
+    static_cast<SharedSymbolTable*>(m_symbolTable)->ref();
 }
 
 JSActivation::~JSActivation()
 {
-    delete d();
+    static_cast<SharedSymbolTable*>(m_symbolTable)->deref();
 }
 
@@ -56 +61 @@
 
     // No need to mark our registers if they're still in the RegisterFile.
-    Register* registerArray = d()->registerArray.get();
+    Register* registerArray = m_registerArray.get();
     if (!registerArray)
         return;
 
-    size_t numParametersMinusThis = d()->functionExecutable->parameterCount();
+    size_t numParametersMinusThis = m_functionExecutable->parameterCount();
 
     size_t count = numParametersMinusThis;
     markStack.deprecatedAppendValues(registerArray, count);
 
-    size_t numVars = d()->functionExecutable->capturedVariableCount();
+    size_t numVars = m_functionExecutable->capturedVariableCount();
 
     // Skip the call frame, which sits between the parameters and vars.
@@ -75 +80 @@
     SymbolTableEntry entry = symbolTable().inlineGet(propertyName.impl());
     if (!entry.isNull()) {
-        ASSERT(entry.getIndex() < static_cast<int>(d()->functionExecutable->capturedVariableCount()));
+        ASSERT(entry.getIndex() < static_cast<int>(m_functionExecutable->capturedVariableCount()));
         slot.setValue(registerAt(entry.getIndex()).jsValue());
         return true;
@@ -91 +96 @@
     if (entry.isReadOnly())
         return true;
-    ASSERT(entry.getIndex() < static_cast<int>(d()->functionExecutable->capturedVariableCount()));
+    ASSERT(entry.getIndex() < static_cast<int>(m_functionExecutable->capturedVariableCount()));
     registerAt(entry.getIndex()) = value;
     return true;
@@ -100 +105 @@
     SymbolTable::const_iterator end = symbolTable().end();
     for (SymbolTable::const_iterator it = symbolTable().begin(); it != end; ++it) {
-        ASSERT(it->second.getIndex() < static_cast<int>(d()->functionExecutable->capturedVariableCount()));
+        ASSERT(it->second.getIndex() < static_cast<int>(m_functionExecutable->capturedVariableCount()));
         if (!(it->second.getAttributes() & DontEnum) || (mode == IncludeDontEnumProperties))
             propertyNames.add(Identifier(exec, it->first.get()));
@@ -117 +122 @@
     SymbolTableEntry& entry = iter->second;
     ASSERT(!entry.isNull());
-    if (entry.getIndex() >= static_cast<int>(d()->functionExecutable->capturedVariableCount()))
+    if (entry.getIndex() >= static_cast<int>(m_functionExecutable->capturedVariableCount()))
         return false;
     entry.setAttributes(attributes);
@@ -196 +201 @@
 bool JSActivation::isDynamicScope(bool& requiresDynamicChecks) const
 {
-    requiresDynamicChecks = d()->functionExecutable->usesEval();
+    requiresDynamicChecks = m_functionExecutable->usesEval();
     return false;
 }
@@ -203 +208 @@
 {
     JSActivation* activation = asActivation(slotBase);
-    CallFrame* callFrame = CallFrame::create(activation->d()->registers);
-    int argumentsRegister = activation->d()->functionExecutable->generatedBytecode().argumentsRegister();
+    CallFrame* callFrame = CallFrame::create(activation->m_registers);
+    int argumentsRegister = activation->m_functionExecutable->generatedBytecode().argumentsRegister();
     if (JSValue arguments = callFrame->uncheckedR(argumentsRegister).jsValue())
         return arguments;