Changeset 11773 in webkit for trunk/JavaScriptCore/kjs/object.h

Timestamp:

Dec 27, 2005, 1:24:14 AM (19 years ago)

Author:

mjs

Message:

Reviewed by Darin and Geoff.

Changes by me and Anders.

• mostly fixed REGRESSION: 5-10% performance regression on JS iBench from getter/setter change ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6083

• also fixed some warnings reported by -Winline

• JavaScriptCorePrefix.h: Move new and delete definitions higher so there aren't conflicts with use in standard C++ headers
• kjs/object.cpp: (KJS::throwSetterError): Moved this piece of put into a seprate function to avoid the PIC branch. (KJS::JSObject::put): Use hasGetterSetterProperties to avoid expensive stuff when not needed. Also use GetterSetter properties attribute. (KJS::JSObject::deleteProperty): Recompute whether any properties are getter/setter properties any more, if this one was one. (KJS::JSObject::defineGetter): Let the PropertyMap know that it has getter/setter properties now (and use the new attribute). (KJS::JSObject::defineSetter): Ditto. (KJS::JSObject::fillGetterPropertySlot): Out-of-line helper for getOwnPropertySlot, to avoid global variable access in the hot code path.
• kjs/object.h: (KJS::): Added GetterSetter attribute. (KJS::JSCell::isObject): Moved lower to be after inline methods it uses. (KJS::JSValue::isObject): ditto (KJS::JSObject::getOwnPropertySlot): try to avoid impact of getters and setters as much as possible in the case where they are not being used
• kjs/property_map.cpp: (KJS::PropertyMap::containsGettersOrSetters): New method to help with this
• kjs/property_map.h: (KJS::PropertyMap::hasGetterSetterProperties): Ditto (KJS::PropertyMap::setHasGetterSetterProperties): Ditto (KJS::PropertyMap::PropertyMap): Added a crazy hack to store the global "has getter/setter properties" flag in the property map single entry, to avoid making objects any bigger.
• kjs/value.h: Moved some things to object.h to make -Winline happier

File:

• trunk/JavaScriptCore/kjs/object.h (modified) (5 diffs)

trunk/JavaScriptCore/kjs/object.h

@@ -51 +51 @@
   // ECMA 262-3 8.6.1
   // Property attributes
-  enum Attribute { None       = 0,
-                   ReadOnly   = 1 << 1, // property can be only read, not written
-                   DontEnum   = 1 << 2, // property doesn't appear in (for .. in ..)
-                   DontDelete = 1 << 3, // property can't be deleted
-                   Internal   = 1 << 4, // an internal property, set to bypass checks
-                   Function   = 1 << 5 }; // property is a function - only used by static hashtables
+  enum Attribute { None         = 0,
+                   ReadOnly     = 1 << 1, // property can be only read, not written
+                   DontEnum     = 1 << 2, // property doesn't appear in (for .. in ..)
+                   DontDelete   = 1 << 3, // property can't be deleted
+                   Internal     = 1 << 4, // an internal property, set to bypass checks
+                   Function     = 1 << 5, // property is a function - only used by static hashtables
+                   GetterSetter = 1 << 6 }; // property is a getter or setter
 
   /**
@@ -503 +504 @@
     void putDirect(const Identifier &propertyName, JSValue *value, int attr = 0);
     void putDirect(const Identifier &propertyName, int value, int attr = 0);
-    
+
+    void fillGetterPropertySlot(PropertySlot& slot, JSValue **location);
+
     void defineGetter(ExecState *exec, const Identifier& propertyName, JSObject *getterFunc);
     void defineSetter(ExecState *exec, const Identifier& propertyName, JSObject *setterFunc);
@@ -567 +570 @@
 JSObject *throwError(ExecState *, ErrorType, const char *message);
 JSObject *throwError(ExecState *, ErrorType);
-  
-inline bool JSCell::isObject(const ClassInfo *info) const
-{
-    return isObject() && static_cast<const JSObject *>(this)->inherits(info);
-}
 
 inline JSObject::JSObject(JSObject *proto)
@@ -613 +611 @@
 }
 
+// this method is here to be after the inline declaration of JSObject::inherits
+inline bool JSCell::isObject(const ClassInfo *info) const
+{
+    return isObject() && static_cast<const JSObject *>(this)->inherits(info);
+}
+
+// this method is here to be after the inline declaration of JSCell::isObject
+inline bool JSValue::isObject(const ClassInfo *c) const
+{
+    return !SimpleNumber::is(this) && downcast()->isObject(c);
+}
+
 // It may seem crazy to inline a function this large but it makes a big difference
 // since this is function very hot in variable lookup
@@ -633 +643 @@
 // but it makes a big difference to property lookup that derived classes can inline their
 // base class call to this.
-inline bool JSObject::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
+ALWAYS_INLINE bool JSObject::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
 {
     if (JSValue **location = getDirectLocation(propertyName)) {
-        if ((*location)->type() == GetterSetterType) {
-            GetterSetterImp *gs = static_cast<GetterSetterImp *>(*location);
-            JSObject *getterFunc = gs->getGetter();
-            if (getterFunc)
-                slot.setGetterSlot(this, getterFunc);
-            else
-                slot.setUndefined(this);
-        } else {
+        if (_prop.hasGetterSetterProperties() && location[0]->type() == GetterSetterType)
+            fillGetterPropertySlot(slot, location);
+        else
             slot.setValueSlot(this, location);
-        }
         return true;
     }