Changeset 27218 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Oct 29, 2007, 12:55:34 AM (18 years ago)

Author:

eseidel

Message:

2007-10-29 Eric Seidel <​[email protected]>

Reviewed by darin.

Give StringInstance a getOwnPropertySlot(ExecState, unsigned, PropertySlot) fastpath, just like Arrays.
Make it a compile time error to use toString(ExecState) on a StringInstance

SunSpider claims this was a 6.6% speedup overall (22% on string-base64)

• kjs/internal.h: (KJS::StringImp::getLength):
• kjs/string_object.cpp: (KJS::StringInstance::lengthGetter): (KJS::StringInstance::inlineGetOwnPropertySlot): (KJS::StringInstance::getOwnPropertySlot):
• kjs/string_object.h:

Location:

trunk/JavaScriptCore/kjs

Files:

• internal.h (modified) (2 diffs)
• string_object.cpp (modified) (1 diff)
• string_object.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/internal.h

@@ -50 +50 @@
     enum HasOtherOwnerType { HasOtherOwner };
     StringImp(const UString& value, HasOtherOwnerType) : val(value) { }
-    UString value() const { return val; }
+    const UString& value() const { return val; }
 
+  private:
     virtual JSType type() const { return StringType; }
 
@@ -58 +59 @@
     virtual bool toBoolean(ExecState *exec) const;
     virtual double toNumber(ExecState *exec) const;
-    virtual UString toString(ExecState *exec) const;
     virtual JSObject *toObject(ExecState *exec) const;
-
-  private:
+    virtual UString toString(ExecState*) const;
+    
     UString val;
   };

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -64 +64 @@
 }
 
-JSValue *StringInstance::lengthGetter(ExecState* exec, JSObject*, const Identifier&, const PropertySlot &slot)
-{
-    return jsNumber(static_cast<StringInstance*>(slot.slotBase())->internalValue()->toString(exec).size());
-}
-
-JSValue *StringInstance::indexGetter(ExecState* exec, JSObject*, const Identifier&, const PropertySlot &slot)
-{
-    const UChar c = static_cast<StringInstance *>(slot.slotBase())->internalValue()->toString(exec)[slot.index()];
+JSValue *StringInstance::lengthGetter(ExecState*, JSObject*, const Identifier&, const PropertySlot &slot)
+{
+    return jsNumber(static_cast<StringInstance*>(slot.slotBase())->internalValue()->value().size());
+}
+
+JSValue *StringInstance::indexGetter(ExecState*, JSObject*, const Identifier&, const PropertySlot &slot)
+{
+    const UChar c = static_cast<StringInstance*>(slot.slotBase())->internalValue()->value()[slot.index()];
     return jsString(UString(&c, 1));
 }
 
-bool StringInstance::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot &slot)
-{
-  if (propertyName == exec->propertyNames().length) {
-    slot.setCustom(this, lengthGetter);
-    return true;
-  }
-
-  bool ok;
-  const unsigned index = propertyName.toArrayIndex(&ok);
-  if (ok) {
-    const UString s = internalValue()->toString(exec);
-    const unsigned length = s.size();
-    if (index < length) {
-    slot.setCustomIndex(this, index, indexGetter);
-    return true;
-    }
-  }
-
-  return JSObject::getOwnPropertySlot(exec, propertyName, slot);
+bool StringInstance::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
+{
+    if (propertyName == exec->propertyNames().length) {
+        slot.setCustom(this, lengthGetter);
+        return true;
+    }
+
+    bool isStrictUInt32;
+    unsigned i = propertyName.toStrictUInt32(&isStrictUInt32);
+    unsigned length = internalValue()->value().size();
+    if (isStrictUInt32 && i < length) {
+        slot.setCustomIndex(this, i, indexGetter);
+        return true;
+    }
+    
+    return JSObject::getOwnPropertySlot(exec, propertyName, slot);
+}
+    
+bool StringInstance::getOwnPropertySlot(ExecState* exec, unsigned propertyName, PropertySlot& slot)
+{
+    unsigned length = internalValue()->value().size();
+    if (propertyName < length) {
+        slot.setCustomIndex(this, propertyName, indexGetter);
+        return true;
+    }
+    
+    return JSObject::getOwnPropertySlot(exec, Identifier::from(propertyName), slot);
 }
 

trunk/JavaScriptCore/kjs/string_object.h

@@ -32 +32 @@
   public:
     StringInstance(JSObject *proto);
-    StringInstance(JSObject *proto, StringImp* string);
-    StringInstance(JSObject *proto, const UString &string);
+    StringInstance(JSObject *proto, StringImp*);
+    StringInstance(JSObject *proto, const UString&);
 
     virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
-    virtual void put(ExecState* exec, const Identifier& propertyName, JSValue* value, int attr = None);
+    virtual bool getOwnPropertySlot(ExecState*, unsigned propertyName, PropertySlot&);
+
+    virtual void put(ExecState* exec, const Identifier& propertyName, JSValue*, int attr = None);
     virtual bool deleteProperty(ExecState* exec, const Identifier& propertyName);
     virtual void getPropertyNames(ExecState*, PropertyNameArray&);
@@ -46 +48 @@
 
   private:
-    static JSValue *lengthGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot &slot);
-    static JSValue *indexGetter(ExecState *exec, JSObject *, const Identifier&, const PropertySlot &slot);
+    bool inlineGetOwnPropertySlot(ExecState*, unsigned, PropertySlot&);
+
+    static JSValue* lengthGetter(ExecState*, JSObject *, const Identifier&, const PropertySlot&);
+    static JSValue* indexGetter(ExecState*, JSObject *, const Identifier&, const PropertySlot&);
   };