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

Timestamp:

Sep 10, 2013, 2:16:42 PM (12 years ago)

Author:

[email protected]

Message:

Support WeakMap
​https://bugs.webkit.org/show_bug.cgi?id=120912

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

Add support for ES6 WeakMap. Add the cluster of boilerplate
classes around the core WeakMapData class.

WeakMapData is a simple object->value hash table that uses a
combo of WeakReferenceHarvester to conditionally keep the weak
value reference live, and UnconditionalFinalizer to clean the
dead keys from the table post-GC.

• CMakeLists.txt:
• GNUmakefile.list.am:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Target.pri:
• runtime/CommonIdentifiers.h:
• runtime/JSGlobalObject.cpp:
• runtime/JSGlobalObject.h:

(JSC::JSGlobalObject::weakMapDataStructure):

• runtime/JSWeakMap.cpp: Added.

(JSC::JSWeakMap::finishCreation):
(JSC::JSWeakMap::visitChildren):

• runtime/JSWeakMap.h: Added.

(JSC::JSWeakMap::createStructure):
(JSC::JSWeakMap::create):
(JSC::JSWeakMap::weakMapData):
(JSC::JSWeakMap::JSWeakMap):

• runtime/WeakMapConstructor.cpp: Added.

(JSC::WeakMapConstructor::finishCreation):
(JSC::constructWeakMap):
(JSC::WeakMapConstructor::getConstructData):
(JSC::WeakMapConstructor::getCallData):

• runtime/WeakMapConstructor.h: Added.

(JSC::WeakMapConstructor::create):
(JSC::WeakMapConstructor::createStructure):
(JSC::WeakMapConstructor::WeakMapConstructor):

• runtime/WeakMapData.cpp: Added.

(JSC::WeakMapData::WeakMapData):
(JSC::WeakMapData::finishCreation):
(JSC::WeakMapData::destroy):
(JSC::WeakMapData::visitChildren):
(JSC::WeakMapData::set):
(JSC::WeakMapData::get):
(JSC::WeakMapData::remove):
(JSC::WeakMapData::contains):
(JSC::WeakMapData::clear):
(JSC::WeakMapData::DeadKeyCleaner::visitWeakReferences):
(JSC::WeakMapData::DeadKeyCleaner::finalizeUnconditionally):

• runtime/WeakMapData.h: Added.

(JSC::WeakMapData::create):
(JSC::WeakMapData::createStructure):
(JSC::WeakMapData::DeadKeyCleaner::DeadKeyCleaner):

• runtime/WeakMapPrototype.cpp: Added.

(JSC::WeakMapPrototype::finishCreation):
(JSC::getWeakMapData):
(JSC::protoFuncWeakMapClear):
(JSC::protoFuncWeakMapDelete):
(JSC::protoFuncWeakMapGet):
(JSC::protoFuncWeakMapHas):
(JSC::protoFuncWeakMapSet):

• runtime/WeakMapPrototype.h: Added.

(JSC::WeakMapPrototype::create):
(JSC::WeakMapPrototype::createStructure):
(JSC::WeakMapPrototype::WeakMapPrototype):

LayoutTests:

Basic tests.

• js/basic-weakmap-expected.txt: Added.
• js/basic-weakmap.html: Added.
• js/script-tests/basic-weakmap.js: Added.

File:

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

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h

@@ -81 +81 @@
     macro(Error, error, error, ErrorInstance, Error) \
     macro(JSArrayBuffer, arrayBuffer, arrayBuffer, JSArrayBuffer, ArrayBuffer) \
+    macro(WeakMap, weakMap, weakMap, JSWeakMap, WeakMap) \
 
 #define DECLARE_SIMPLE_BUILTIN_TYPE(capitalName, lowerName, properName, instanceType, jsName) \
@@ -201 +202 @@
 
     WriteBarrier<Structure> m_mapDataStructure;
+    WriteBarrier<Structure> m_weakMapDataStructure;
 
 #define DEFINE_STORAGE_FOR_SIMPLE_TYPE(capitalName, lowerName, properName, instanceType, jsName) \
@@ -399 +401 @@
     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(); }