Changeset 201853 in webkit

Timestamp:

Jun 8, 2016, 10:43:46 PM (10 years ago)

Author:

barraclough@apple.com

Message:

JSObject::reifyAllStaticProperties cleanup
​https://bugs.webkit.org/show_bug.cgi?id=158543

Reviewed by Mark Lam.

• JSObject & Structure contain fields labeled 'staticFunctionsReified', however reification now affects all properties, not just functions. Rename to 'staticPropertiesReified'.
• reifyAllStaticProperties relies on a 'hasStaticProperties' method on ClassInfo that walks the ClassInfo inheritance chain looking for static property tables. We can now more efficiently get this information from TypeInfo.
• reifyAllStaticProperties triggers a 'toUncacheableDictionaryTransition'; this is overzealous, cacheable dictionary is sufficient - this is what we do in the case of DOM prototype property reification (see 'reifyStaticProperties' in Lookup.h). (Changing this with an eye on switching

DOM prototype property reification to use JSObject

reifyAllStaticProperties, rather than having its own special purpose code path.)

• runtime/ClassInfo.h:

(JSC::ClassInfo::hasStaticProperties): Deleted.

• deprecated by TypeInfo::hasStaticPropertyTable.

• runtime/JSObject.cpp:

(JSC::JSObject::putInlineSlow):
(JSC::JSObject::deleteProperty):
(JSC::JSObject::getOwnNonIndexPropertyNames):

• staticFunctionsReified -> staticPropertiesReified

(JSC::JSObject::reifyAllStaticProperties):

• hasStaticProperties -> TypeInfo::hasStaticPropertyTable
• toUncacheableDictionaryTransition -> toCacheableDictionaryTransition
• staticFunctionsReified -> staticPropertiesReified

• runtime/JSObject.h:

(JSC::JSObject::staticPropertiesReified):
(JSC::JSObject::staticFunctionsReified): Deleted.

• runtime/Lookup.cpp:

(JSC::setUpStaticFunctionSlot):

• runtime/Lookup.h:

(JSC::getStaticPropertySlotFromTable):
(JSC::replaceStaticPropertySlot):

• runtime/Structure.cpp:

(JSC::Structure::Structure):

• runtime/Structure.h:
  • staticFunctionsReified -> staticPropertiesReified

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/ClassInfo.h (modified) (1 diff)
• runtime/JSObject.cpp (modified) (5 diffs)
• runtime/JSObject.h (modified) (1 diff)
• runtime/Lookup.cpp (modified) (1 diff)
• runtime/Lookup.h (modified) (2 diffs)
• runtime/Structure.cpp (modified) (3 diffs)
• runtime/Structure.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-06-08  Gavin & Ellie Barraclough  <barraclough@apple.com>
+
+        JSObject::reifyAllStaticProperties cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=158543
+
+        Reviewed by Mark Lam.
+
+        - JSObject & Structure contain fields labeled 'staticFunctionsReified', however reification now
+          affects all properties, not just functions. Rename to 'staticPropertiesReified'.
+        - reifyAllStaticProperties relies on a 'hasStaticProperties' method on ClassInfo that walks the
+          ClassInfo inheritance chain looking for static property tables. We can now more efficiently
+          get this information from TypeInfo.
+        - reifyAllStaticProperties triggers a 'toUncacheableDictionaryTransition'; this is overzealous,
+          cacheable dictionary is sufficient - this is what we do in the case of DOM prototype property
+          reification (see 'reifyStaticProperties' in Lookup.h). (Changing this with an eye on switching
+          DOM prototype property reification to use JSObject:: reifyAllStaticProperties, rather than
+          having its own special purpose code path.)
+
+        * runtime/ClassInfo.h:
+        (JSC::ClassInfo::hasStaticProperties): Deleted.
+            - deprecated by TypeInfo::hasStaticPropertyTable.
+        * runtime/JSObject.cpp:
+        (JSC::JSObject::putInlineSlow):
+        (JSC::JSObject::deleteProperty):
+        (JSC::JSObject::getOwnNonIndexPropertyNames):
+            - staticFunctionsReified -> staticPropertiesReified
+        (JSC::JSObject::reifyAllStaticProperties):
+            - hasStaticProperties -> TypeInfo::hasStaticPropertyTable
+            - toUncacheableDictionaryTransition -> toCacheableDictionaryTransition
+            - staticFunctionsReified -> staticPropertiesReified
+        * runtime/JSObject.h:
+        (JSC::JSObject::staticPropertiesReified):
+        (JSC::JSObject::staticFunctionsReified): Deleted.
+        * runtime/Lookup.cpp:
+        (JSC::setUpStaticFunctionSlot):
+        * runtime/Lookup.h:
+        (JSC::getStaticPropertySlotFromTable):
+        (JSC::replaceStaticPropertySlot):
+        * runtime/Structure.cpp:
+        (JSC::Structure::Structure):
+        * runtime/Structure.h:
+            - staticFunctionsReified -> staticPropertiesReified
+
 2016-06-08  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/JavaScriptCore/runtime/ClassInfo.h

@@ -198 +198 @@
     }
 
-    bool hasStaticProperties() const
-    {
-        for (const ClassInfo* ci = this; ci; ci = ci->parentClass) {
-            if (ci->staticPropHashTable)
-                return true;
-        }
-        return false;
-    }
-
     JS_EXPORT_PRIVATE bool hasStaticSetterOrReadonlyProperties() const;
 

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -569 +569 @@
             break;
         }
-        if (!obj->staticFunctionsReified()) {
+        if (!obj->staticPropertiesReified()) {
             if (obj->classInfo()->hasStaticSetterOrReadonlyProperties()) {
                 if (auto* entry = obj->findPropertyHashEntry(propertyName))
@@ -1499 +1499 @@
     unsigned attributes;
 
-    if (!thisObject->staticFunctionsReified()) {
+    if (!thisObject->staticPropertiesReified()) {
         if (auto* entry = thisObject->findPropertyHashEntry(propertyName)) {
             // If the static table contains a non-configurable (DontDelete) property then we can return early;
@@ -1891 +1891 @@
 void JSObject::getOwnNonIndexPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
 {
-    if (!object->staticFunctionsReified())
+    if (!object->staticPropertiesReified())
         getClassPropertyNames(exec, object->classInfo(), propertyNames, mode);
 
@@ -1966 +1966 @@
 void JSObject::reifyAllStaticProperties(ExecState* exec)
 {
-    ASSERT(!staticFunctionsReified());
+    ASSERT(!staticPropertiesReified());
     VM& vm = exec->vm();
 
     // If this object's ClassInfo has no static properties, then nothing to reify!
     // We can safely set the flag to avoid the expensive check again in the future.
-    if (!classInfo()->hasStaticProperties()) {
-        structure(vm)->setStaticFunctionsReified(true);
+    if (!TypeInfo::hasStaticPropertyTable(inlineTypeFlags())) {
+        structure(vm)->setStaticPropertiesReified(true);
         return;
     }
 
-    if (!structure(vm)->isUncacheableDictionary())
-        setStructure(vm, Structure::toUncacheableDictionaryTransition(vm, structure(vm)));
+    if (!structure(vm)->isDictionary())
+        setStructure(vm, Structure::toCacheableDictionaryTransition(vm, structure(vm)));
 
     for (const ClassInfo* info = classInfo(); info; info = info->parentClass) {
@@ -1993 +1993 @@
     }
 
-    structure(vm)->setStaticFunctionsReified(true);
+    structure(vm)->setStaticPropertiesReified(true);
 }
 

trunk/Source/JavaScriptCore/runtime/JSObject.h

@@ -679 +679 @@
     }
 
-    bool staticFunctionsReified() { return structure()->staticFunctionsReified(); }
+    bool staticPropertiesReified() { return structure()->staticPropertiesReified(); }
     void reifyAllStaticProperties(ExecState*);
 

trunk/Source/JavaScriptCore/runtime/Lookup.cpp

@@ -54 +54 @@
         // If a property is ever deleted from an object with a static table, then we reify
         // all static functions at that time - after this we shouldn't be re-adding anything.
-        if (thisObject->staticFunctionsReified())
+        if (thisObject->staticPropertiesReified())
             return false;
 

trunk/Source/JavaScriptCore/runtime/Lookup.h

@@ -211 +211 @@
 inline bool getStaticPropertySlotFromTable(VM& vm, const HashTable& table, JSObject* thisObject, PropertyName propertyName, PropertySlot& slot)
 {
-    if (thisObject->staticFunctionsReified())
+    if (thisObject->staticPropertiesReified())
         return false;
 
@@ -235 +235 @@
         return false;
 
-    if (!thisObject->staticFunctionsReified())
+    if (!thisObject->staticPropertiesReified())
         thisObject->JSObject::setStructure(vm, Structure::attributeChangeTransition(vm, thisObject->structure(), propertyName, 0));
 

trunk/Source/JavaScriptCore/runtime/Structure.cpp

@@ -206 +206 @@
     setDidPreventExtensions(false);
     setDidTransition(false);
-    setStaticFunctionsReified(false);
+    setStaticPropertiesReified(false);
     setTransitionWatchpointIsLikelyToBeFired(false);
     setHasBeenDictionary(false);
@@ -237 +237 @@
     setDidPreventExtensions(false);
     setDidTransition(false);
-    setStaticFunctionsReified(false);
+    setStaticPropertiesReified(false);
     setTransitionWatchpointIsLikelyToBeFired(false);
     setHasBeenDictionary(false);
@@ -267 +267 @@
     setDidPreventExtensions(previous->didPreventExtensions());
     setDidTransition(true);
-    setStaticFunctionsReified(previous->staticFunctionsReified());
+    setStaticPropertiesReified(previous->staticPropertiesReified());
     setHasBeenDictionary(previous->hasBeenDictionary());
  

trunk/Source/JavaScriptCore/runtime/Structure.h

@@ -610 +610 @@
     DEFINE_BITFIELD(bool, didPreventExtensions, DidPreventExtensions, 1, 20);
     DEFINE_BITFIELD(bool, didTransition, DidTransition, 1, 21);
-    DEFINE_BITFIELD(bool, staticFunctionsReified, StaticFunctionsReified, 1, 22);
+    DEFINE_BITFIELD(bool, staticPropertiesReified, StaticPropertiesReified, 1, 22);
     DEFINE_BITFIELD(bool, hasBeenFlattenedBefore, HasBeenFlattenedBefore, 1, 23);
     DEFINE_BITFIELD(bool, hasCustomGetterSetterProperties, HasCustomGetterSetterProperties, 1, 24);