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

Timestamp:

Jul 24, 2013, 8:59:04 PM (12 years ago)

Author:

[email protected]

Message:

fourthTier: SymbolTable should be thread-safe
​https://bugs.webkit.org/show_bug.cgi?id=115301

Reviewed by Geoffrey Garen.

Makes SymbolTable thread-safe. Relies on SymbolTableEntry already being immutable,
other than the WatchpointSet; but the WatchpointSet already has a righteous
concurrency protocol. So, this patch just protects the SymbolTable's HashMap.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::nameForRegister):

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::addVar):

• runtime/Executable.cpp:

(JSC::ProgramExecutable::addGlobalVar):

• runtime/JSActivation.cpp:

(JSC::JSActivation::getOwnNonIndexPropertyNames):
(JSC::JSActivation::symbolTablePutWithAttributes):

• runtime/JSSymbolTableObject.cpp:

(JSC::JSSymbolTableObject::getOwnNonIndexPropertyNames):

• runtime/JSSymbolTableObject.h:

(JSC::symbolTableGet):
(JSC::symbolTablePut):
(JSC::symbolTablePutWithAttributes):

• runtime/SymbolTable.cpp:

(JSC::SymbolTable::SymbolTable):
(JSC::SymbolTable::~SymbolTable):

• runtime/SymbolTable.h:

(JSC::SymbolTable::find):
(JSC::SymbolTable::get):
(JSC::SymbolTable::inlineGet):
(JSC::SymbolTable::begin):
(JSC::SymbolTable::end):
(JSC::SymbolTable::size):
(JSC::SymbolTable::add):
(JSC::SymbolTable::set):
(JSC::SymbolTable::contains):

File:

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

trunk/Source/JavaScriptCore/runtime/JSActivation.cpp

@@ -114 +114 @@
         propertyNames.add(exec->propertyNames().arguments);
 
-    SymbolTable::const_iterator end = thisObject->symbolTable()->end();
-    for (SymbolTable::const_iterator it = thisObject->symbolTable()->begin(); it != end; ++it) {
-        if (it->value.getAttributes() & DontEnum && mode != IncludeDontEnumProperties)
-            continue;
-        if (!thisObject->isValid(it->value))
-            continue;
-        propertyNames.add(Identifier(exec, it->key.get()));
+    {
+        SymbolTable::Locker locker(thisObject->symbolTable()->m_lock);
+        SymbolTable::Map::iterator end = thisObject->symbolTable()->end(locker);
+        for (SymbolTable::Map::iterator it = thisObject->symbolTable()->begin(locker); it != end; ++it) {
+            if (it->value.getAttributes() & DontEnum && mode != IncludeDontEnumProperties)
+                continue;
+            if (!thisObject->isValid(it->value))
+                continue;
+            propertyNames.add(Identifier(exec, it->key.get()));
+        }
     }
     // Skip the JSVariableObject implementation of getOwnNonIndexPropertyNames
@@ -130 +133 @@
     ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
     
-    SymbolTable::iterator iter = symbolTable()->find(propertyName.publicName());
-    if (iter == symbolTable()->end())
-        return false;
-    SymbolTableEntry& entry = iter->value;
-    ASSERT(!entry.isNull());
-    if (!isValid(entry))
-        return false;
-
-    entry.setAttributes(attributes);
-    registerAt(entry.getIndex()).set(vm, this, value);
+    WriteBarrierBase<Unknown>* reg;
+    {
+        SymbolTable::Locker locker(symbolTable()->m_lock);
+        SymbolTable::Map::iterator iter = symbolTable()->find(locker, propertyName.publicName());
+        if (iter == symbolTable()->end(locker))
+            return false;
+        SymbolTableEntry& entry = iter->value;
+        ASSERT(!entry.isNull());
+        if (!isValid(entry))
+            return false;
+        
+        entry.setAttributes(attributes);
+        reg = &registerAt(entry.getIndex());
+    }
+    reg->set(vm, this, value);
     return true;
 }