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

Timestamp:

Mar 3, 2011, 2:30:59 PM (14 years ago)

Author:

[email protected]

Message:

2011-03-03 Oliver Hunt <​[email protected]>

Reviewed by Geoffrey Garen.

JSVariableObject needs to use WriteBarrier for symboltable property storage
​https://bugs.webkit.org/show_bug.cgi?id=55698

Replace the direct usage of Register in JSVariableObject (and descendents)
with WriteBarrier. This requires updating the Arguments object to use
WriteBarrier as well.

• interpreter/Interpreter.cpp: (JSC::Interpreter::unwindCallFrame): (JSC::Interpreter::privateExecute): (JSC::Interpreter::retrieveArguments):
• jit/JITStubs.cpp: (JSC::DEFINE_STUB_FUNCTION):
• runtime/ArgList.h: (JSC::MarkedArgumentBuffer::initialize):
• runtime/Arguments.cpp: (JSC::Arguments::markChildren): (JSC::Arguments::copyToRegisters): (JSC::Arguments::fillArgList): (JSC::Arguments::getOwnPropertySlot): (JSC::Arguments::getOwnPropertyDescriptor): (JSC::Arguments::put):
• runtime/Arguments.h: (JSC::Arguments::setActivation): (JSC::Arguments::Arguments): (JSC::Arguments::copyRegisters): (JSC::JSActivation::copyRegisters):
• runtime/JSActivation.cpp: (JSC::JSActivation::markChildren): (JSC::JSActivation::symbolTableGet): (JSC::JSActivation::symbolTablePut): (JSC::JSActivation::symbolTablePutWithAttributes): (JSC::JSActivation::put): (JSC::JSActivation::putWithAttributes): (JSC::JSActivation::argumentsGetter):
• runtime/JSActivation.h:
• runtime/JSGlobalObject.cpp: (JSC::JSGlobalObject::put): (JSC::JSGlobalObject::putWithAttributes): (JSC::JSGlobalObject::markChildren): (JSC::JSGlobalObject::copyGlobalsFrom): (JSC::JSGlobalObject::copyGlobalsTo): (JSC::JSGlobalObject::resizeRegisters):
• runtime/JSGlobalObject.h: (JSC::JSGlobalObject::setRegisters): (JSC::JSGlobalObject::addStaticGlobals):
• runtime/JSStaticScopeObject.cpp: (JSC::JSStaticScopeObject::put): (JSC::JSStaticScopeObject::putWithAttributes):
• runtime/JSVariableObject.cpp: (JSC::JSVariableObject::symbolTableGet):
• runtime/JSVariableObject.h: (JSC::JSVariableObject::registerAt): (JSC::JSVariableObject::JSVariableObjectData::JSVariableObjectData): (JSC::JSVariableObject::symbolTableGet): (JSC::JSVariableObject::symbolTablePut): (JSC::JSVariableObject::symbolTablePutWithAttributes): (JSC::JSVariableObject::copyRegisterArray): (JSC::JSVariableObject::setRegisters):

2011-03-03 Oliver Hunt <​[email protected]>

Reviewed by Geoffrey Garen.

JSVariableObject needs to use WriteBarrier for symboltable property storage
​https://bugs.webkit.org/show_bug.cgi?id=55698

Update to pass JSGlobalData for the symbol table write used
to set the document property.

• bindings/js/JSDOMWindowBase.cpp: (WebCore::JSDOMWindowBase::updateDocument):

File:

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

trunk/Source/JavaScriptCore/runtime/JSActivation.cpp

@@ -61 +61 @@
 
     // No need to mark our registers if they're still in the RegisterFile.
-    Register* registerArray = m_registerArray.get();
+    WriteBarrier<Unknown>* registerArray = m_registerArray.get();
     if (!registerArray)
         return;
@@ -68 +68 @@
 
     size_t count = numParametersMinusThis;
-    markStack.deprecatedAppendValues(registerArray, count);
+    markStack.appendValues(registerArray, count);
 
     size_t numVars = m_functionExecutable->capturedVariableCount();
 
     // Skip the call frame, which sits between the parameters and vars.
-    markStack.deprecatedAppendValues(registerArray + count + RegisterFile::CallFrameHeaderSize, numVars, MayContainNullValues);
+    markStack.appendValues(registerArray + count + RegisterFile::CallFrameHeaderSize, numVars, MayContainNullValues);
 }
 
@@ -81 +81 @@
     if (!entry.isNull()) {
         ASSERT(entry.getIndex() < static_cast<int>(m_functionExecutable->capturedVariableCount()));
-        slot.setValue(registerAt(entry.getIndex()).jsValue());
+        slot.setValue(registerAt(entry.getIndex()).get());
         return true;
     }
@@ -87 +87 @@
 }
 
-inline bool JSActivation::symbolTablePut(const Identifier& propertyName, JSValue value)
+inline bool JSActivation::symbolTablePut(JSGlobalData& globalData, const Identifier& propertyName, JSValue value)
 {
     ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
@@ -97 +97 @@
         return true;
     ASSERT(entry.getIndex() < static_cast<int>(m_functionExecutable->capturedVariableCount()));
-    registerAt(entry.getIndex()) = value;
+    registerAt(entry.getIndex()).set(globalData, this, value);
     return true;
 }
@@ -113 +113 @@
 }
 
-inline bool JSActivation::symbolTablePutWithAttributes(const Identifier& propertyName, JSValue value, unsigned attributes)
+inline bool JSActivation::symbolTablePutWithAttributes(JSGlobalData& globalData, const Identifier& propertyName, JSValue value, unsigned attributes)
 {
     ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
@@ -125 +125 @@
         return false;
     entry.setAttributes(attributes);
-    registerAt(entry.getIndex()) = value;
+    registerAt(entry.getIndex()).set(globalData, this, value);
     return true;
 }
@@ -155 +155 @@
     ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
 
-    if (symbolTablePut(propertyName, value))
+    if (symbolTablePut(exec->globalData(), propertyName, value))
         return;
 
@@ -170 +170 @@
     ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
 
-    if (symbolTablePutWithAttributes(propertyName, value, attributes))
+    if (symbolTablePutWithAttributes(exec->globalData(), propertyName, value, attributes))
         return;
 
@@ -208 +208 @@
 {
     JSActivation* activation = asActivation(slotBase);
-    CallFrame* callFrame = CallFrame::create(activation->m_registers);
+    CallFrame* callFrame = CallFrame::create(reinterpret_cast<Register*>(activation->m_registers));
     int argumentsRegister = activation->m_functionExecutable->generatedBytecode().argumentsRegister();
     if (JSValue arguments = callFrame->uncheckedR(argumentsRegister).jsValue())