Changeset 155219 in webkit for trunk/Source/JavaScriptCore/runtime/ClassInfo.h

Timestamp:

Sep 6, 2013, 3:32:08 PM (12 years ago)

Author:

[email protected]

Message:

Stop using fastNew/fastDelete in JavaScriptCore
​https://bugs.webkit.org/show_bug.cgi?id=120898

Reviewed by Oliver Hunt.

Source/JavaScriptCore:

Change all the hash table members in ExecState to be OwnPtrs and use
adoptPtr instead. Also, since none of the hash tables can be null, change their getters
to return references and propagate the reference types wherever we know that a HashTable can't be null.

• interpreter/CallFrame.h:

(JSC::ExecState::arrayConstructorTable):
(JSC::ExecState::arrayPrototypeTable):
(JSC::ExecState::booleanPrototypeTable):
(JSC::ExecState::dataViewTable):
(JSC::ExecState::dateTable):
(JSC::ExecState::dateConstructorTable):
(JSC::ExecState::errorPrototypeTable):
(JSC::ExecState::globalObjectTable):
(JSC::ExecState::jsonTable):
(JSC::ExecState::numberConstructorTable):
(JSC::ExecState::numberPrototypeTable):
(JSC::ExecState::objectConstructorTable):
(JSC::ExecState::privateNamePrototypeTable):
(JSC::ExecState::regExpTable):
(JSC::ExecState::regExpConstructorTable):
(JSC::ExecState::regExpPrototypeTable):
(JSC::ExecState::stringConstructorTable):
(JSC::ExecState::promisePrototypeTable):
(JSC::ExecState::promiseConstructorTable):
(JSC::ExecState::promiseResolverPrototypeTable):

• runtime/ClassInfo.h:

(JSC::ClassInfo::propHashTable):

• runtime/Lookup.h:

(JSC::getStaticPropertySlot):
(JSC::getStaticFunctionSlot):
(JSC::getStaticValueSlot):
(JSC::lookupPut):

• runtime/VM.cpp:

(JSC::VM::VM):
(JSC::VM::~VM):

• runtime/VM.h:

Source/WebCore:

Update for changes to JavaScriptCore.

• bindings/js/DOMObjectHashTableMap.h:

(WebCore::DOMObjectHashTableMap::get):

• bindings/js/JSDOMBinding.cpp:

(WebCore::getHashTableForGlobalData):

• bindings/js/JSDOMBinding.h:
• bindings/js/JSDOMWindowCustom.cpp:

(WebCore::JSDOMWindow::put):

• bindings/js/JSPluginElementFunctions.h:

(WebCore::pluginElementCustomGetOwnPropertySlot):

• bindings/js/JSStorageCustom.cpp:

(WebCore::JSStorage::deleteProperty):
(WebCore::JSStorage::putDelegate):

• bindings/scripts/CodeGeneratorJS.pm:

(hashTableAccessor):
(prototypeHashTableAccessor):
(constructorHashTableAccessor):
(GenerateGetOwnPropertySlotBody):
(GenerateImplementation):
(GenerateConstructorHelperMethods):

File:

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

trunk/Source/JavaScriptCore/runtime/ClassInfo.h

@@ -145 +145 @@
 
 struct ClassInfo {
-    /**
-     * A string denoting the class name. Example: "Window".
-     */
+    // A string denoting the class name. Example: "Window".
     const char* className;
 
-    /**
-     * Pointer to the class information of the base class.
-     * 0L if there is none.
-     */
+    // Pointer to the class information of the base class.
+    // nullptrif there is none.
     const ClassInfo* parentClass;
-    /**
-     * Static hash-table of properties.
-     * For classes that can be used from multiple threads, it is accessed via a getter function that would typically return a pointer to thread-specific value.
-     */
+
+    // Static hash-table of properties.
+    // For classes that can be used from multiple threads, it is accessed via a getter function
+    // that would typically return a pointer to a thread-specific value.
     const HashTable* propHashTable(ExecState* exec) const
     {
         if (classPropHashTableGetterFunction)
-            return classPropHashTableGetterFunction(exec);
+            return &classPropHashTableGetterFunction(exec);
+
         return staticPropHashTable;
     }
@@ -185 +182 @@
 
     const HashTable* staticPropHashTable;
-    typedef const HashTable* (*ClassPropHashTableGetterFunction)(ExecState*);
+    typedef const HashTable& (*ClassPropHashTableGetterFunction)(ExecState*);
     const ClassPropHashTableGetterFunction classPropHashTableGetterFunction;