Changeset 253240 in webkit for trunk/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp

Timestamp:

Dec 6, 2019, 9:48:08 PM (6 years ago)

Author:

[email protected]

Message:

[JSC] Put JSModuleNamespaceObject in IsoSubspace
​https://bugs.webkit.org/show_bug.cgi?id=204973

Reviewed by Mark Lam.

We found that we do not need to embed AbstractModuleRecord vector inside JSModuleNamespaceObject: we can just put it
in ExportEntry. So we can make it non-variable-sized cell. Further, this patch puts it in IsoSubspace.

• runtime/CellSize.h:

(JSC::isDynamicallySizedType):
(JSC::cellSize):

• runtime/JSModuleNamespaceObject.cpp:

(JSC::JSModuleNamespaceObject::finishCreation):
(JSC::JSModuleNamespaceObject::visitChildren):
(JSC::JSModuleNamespaceObject::getOwnPropertySlotCommon):

• runtime/JSModuleNamespaceObject.h:
• runtime/VM.cpp:

(JSC::VM::VM):

• runtime/VM.h:

File:

• trunk/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp

@@ -60 +60 @@
 
     m_moduleRecord.set(vm, this, moduleRecord);
+    m_names.reserveCapacity(resolutions.size());
     {
-        unsigned moduleRecordOffset = 0;
-        m_names.reserveCapacity(resolutions.size());
+        auto locker = holdLock(cellLock());
         for (const auto& pair : resolutions) {
-            moduleRecordAt(moduleRecordOffset).set(vm, this, pair.second.moduleRecord);
             m_names.append(pair.first);
-            m_exports.add(pair.first.impl(), ExportEntry {
-                pair.second.localName,
-                moduleRecordOffset
-            });
-            ++moduleRecordOffset;
+            auto addResult = m_exports.add(pair.first.impl(), ExportEntry());
+            addResult.iterator->value.localName = pair.second.localName;
+            addResult.iterator->value.moduleRecord.set(vm, this, pair.second.moduleRecord);
         }
     }
@@ -96 +93 @@
     Base::visitChildren(thisObject, visitor);
     visitor.append(thisObject->m_moduleRecord);
-    for (unsigned i = 0; i < thisObject->m_names.size(); ++i)
-        visitor.appendHidden(thisObject->moduleRecordAt(i));
+    {
+        auto locker = holdLock(thisObject->cellLock());
+        for (auto& pair : thisObject->m_exports)
+            visitor.appendHidden(pair.value.moduleRecord);
+    }
 }
 
@@ -137 +137 @@
     case PropertySlot::InternalMethodType::GetOwnProperty:
     case PropertySlot::InternalMethodType::Get: {
-        JSModuleEnvironment* environment = moduleRecordAt(exportEntry.moduleRecordOffset)->moduleEnvironment();
+        JSModuleEnvironment* environment = exportEntry.moduleRecord->moduleEnvironment();
         ScopeOffset scopeOffset;
         JSValue value = getValue(environment, exportEntry.localName, scopeOffset);