Changeset 155558 in webkit for trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h

Timestamp:

Sep 11, 2013, 1:34:09 PM (12 years ago)

Author:

[email protected]

Message:

MapData and WeakMapData don't need to be objects
​https://bugs.webkit.org/show_bug.cgi?id=121167

Patch by Sam Weinig <​[email protected]> on 2013-09-11
Reviewed by Geoffrey Garen.

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::reset):
(JSC::JSGlobalObject::visitChildren):

• runtime/JSGlobalObject.h:

(JSC::JSGlobalObject::mapStructure):
Remove MapData and WeakMapData structures (they moved to VM with other non-object Structures).

• runtime/JSMap.cpp:

(JSC::JSMap::finishCreation):

• runtime/JSMap.h:

(JSC::JSMap::create):

• runtime/JSSet.cpp:

(JSC::JSSet::finishCreation):

• runtime/JSSet.h:

(JSC::JSSet::create):

• runtime/JSWeakMap.cpp:

(JSC::JSWeakMap::finishCreation):

• runtime/JSWeakMap.h:

(JSC::JSWeakMap::create):
Update to not pass a global object to the MapData or WeakMapData Structure.

• runtime/MapData.cpp:

(JSC::MapData::MapData):

• runtime/MapData.h:

(JSC::MapData::create):
(JSC::MapData::createStructure):

• runtime/WeakMapData.cpp:

(JSC::WeakMapData::WeakMapData):
(JSC::WeakMapData::set): Change to take a VM rather than a CallFrame, as that it all it needs.

• runtime/WeakMapData.h:

(JSC::WeakMapData::create):
(JSC::WeakMapData::createStructure):
Instead of inheriting from JSDestructibleObject, inherit from JSCell and mark self as needing destruction
and having an immortal structure.

• runtime/VM.cpp:

(JSC::VM::VM):

• runtime/VM.h:

Add MapData and WeakMapData Structures.

• runtime/WeakMapPrototype.cpp:

(JSC::protoFuncWeakMapSet):
Pass a VM rather than an ExecState.

File:

• trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h

@@ -201 +201 @@
 #endif // ENABLE(PROMISES)
 
-    WriteBarrier<Structure> m_mapDataStructure;
-    WriteBarrier<Structure> m_weakMapDataStructure;
-
 #define DEFINE_STORAGE_FOR_SIMPLE_TYPE(capitalName, lowerName, properName, instanceType, jsName) \
     WriteBarrier<capitalName ## Prototype> m_ ## lowerName ## Prototype; \
@@ -400 +397 @@
     Structure* internalFunctionStructure() const { return m_internalFunctionStructure.get(); }
     Structure* mapStructure() const { return m_mapStructure.get(); }
-    Structure* mapDataStructure() const { return m_mapDataStructure.get(); }
-    Structure* weakMapDataStructure() const { return m_weakMapDataStructure.get(); }
     Structure* regExpMatchesArrayStructure() const { return m_regExpMatchesArrayStructure.get(); }
     Structure* regExpStructure() const { return m_regExpStructure.get(); }