Changeset 34518 in webkit for trunk/JavaScriptCore/kjs/internal.h

Timestamp:

Jun 12, 2008, 9:53:56 PM (17 years ago)

Author:

Darin Adler

Message:

2008-06-12 Darin Adler <Darin Adler>

Reviewed by Maciej.

• ​https://bugs.webkit.org/show_bug.cgi?id=19434 speed up SunSpider by avoiding some string boxing

Speeds up SunSpider by 1.1%.

Optimized code path for getting built-in properties from strings -- avoid
boxing with a string object in that case. We can make further changes to avoid
even more boxing, but this change alone is a win.

• API/JSCallbackObjectFunctions.h: (KJS::JSCallbackObject::staticValueGetter): Use isObject instead of inherits in asssert, since the type of slotBase() is now JSValue, not JSObject. (KJS::JSCallbackObject::staticFunctionGetter): Ditto. (KJS::JSCallbackObject::callbackGetter): Ditto.

• kjs/internal.cpp: (KJS::StringImp::getPrimitiveNumber): Updated for change of data member name. (KJS::StringImp::toBoolean): Ditto. (KJS::StringImp::toNumber): Ditto. (KJS::StringImp::toString): Ditto. (KJS::StringInstance::create): Added; avoids a bit of cut and paste code. (KJS::StringImp::toObject): Use StringInstance::create. (KJS::StringImp::toThisObject): Ditto. (KJS::StringImp::lengthGetter): Added. Replaces the getter that used to live in the StringInstance class. (KJS::StringImp::indexGetter): Ditto. (KJS::StringImp::indexNumericPropertyGetter): Ditto. (KJS::StringImp::getOwnPropertySlot): Added. Deals with built in properties of the string class without creating a StringInstance.

• kjs/internal.h: (KJS::StringImp::getStringPropertySlot): Added. To be used by both the string and string object getOwnPropertySlot function.

• kjs/lookup.h: (KJS::staticFunctionGetter): Updated since slotBase() is now a JSValue rather than a JSObject.

• kjs/object.h: Removed PropertySlot::slotBase() function, which can now move back into property_slot.h where it belongs since it doesn't have to cast to JSObject*.

• kjs/property_slot.cpp: (KJS::PropertySlot::functionGetter): Updated since slot.slotBase() is now a JSValue* instead of JSObject*. setGetterSlot still guarantees the base is a JSObject*.
• kjs/property_slot.h: (KJS::PropertySlot::PropertySlot): Changed base to JSValue* intead of JSCell*. (KJS::PropertySlot::setStaticEntry): Ditto. (KJS::PropertySlot::setCustom): Ditto. (KJS::PropertySlot::setCustomIndex): Ditto. (KJS::PropertySlot::setCustomNumeric): Ditto. (KJS::PropertySlot::slotBase): Moved inline here since it no longer involves a downcast to JSObject*. (KJS::PropertySlot::setBase): Changed to JSValue*.

• kjs/string_object.cpp: (KJS::StringInstance::getOwnPropertySlot): Changed to use getStringPropertySlot instead of coding the properties here. This allows sharing the code with StringImp.

• kjs/string_object.h: Removed inlineGetOwnPropertySlot, lengthGetter, and indexGetter. Made one of the constructors protected.

• kjs/value.h: Made getOwnPropertySlot private in the JSCell class -- this is better since it's not the real JSObject getOwnPropertySlot semantic and most callers shouldn't use it.

File:

• trunk/JavaScriptCore/kjs/internal.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/internal.h

@@ -3 +3 @@
  *  Copyright (C) 1999-2001 Harri Porten ([email protected])
  *  Copyright (C) 2001 Peter Kelly ([email protected])
- *  Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
+ *  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -25 +25 @@
 #define INTERNAL_H
 
-#include "JSType.h"
 #include "object.h"
-#include "protect.h"
-#include "scope_chain.h"
-#include "types.h"
 #include "ustring.h"
-
-#include <wtf/Noncopyable.h>
-
-#define I18N_NOOP(s) s
 
 namespace KJS {
 
-  class FunctionPrototype;
-
-  // ---------------------------------------------------------------------------
-  //                            Primitive impls
-  // ---------------------------------------------------------------------------
-
   class StringImp : public JSCell {
   public:
-    StringImp(const UString& v) : val(v) { Collector::reportExtraMemoryCost(v.cost()); }
+    StringImp(const UString& value) : m_value(value) { Collector::reportExtraMemoryCost(value.cost()); }
     enum HasOtherOwnerType { HasOtherOwner };
-    StringImp(const UString& value, HasOtherOwnerType) : val(value) { }
-    const UString& value() const { return val; }
+    StringImp(const UString& value, HasOtherOwnerType) : m_value(value) { }
+
+    const UString& value() const { return m_value; }
+
+    bool getStringPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot&);
+    bool getStringPropertySlot(unsigned propertyName, PropertySlot&);
 
   private:
@@ -56 +46 @@
     virtual JSValue* toPrimitive(ExecState*, JSType preferred = UnspecifiedType) const;
     virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue*& value);
-    virtual bool toBoolean(ExecState *exec) const;
-    virtual double toNumber(ExecState *exec) const;
-    virtual JSObject *toObject(ExecState *exec) const;
+    virtual bool toBoolean(ExecState*) const;
+    virtual double toNumber(ExecState*) const;
+    virtual JSObject* toObject(ExecState*) const;
     virtual UString toString(ExecState*) const;
     virtual JSObject* toThisObject(ExecState*) const;
 
-    UString val;
+    // Actually getPropertySlot, not getOwnPropertySlot (see JSCell).
+    virtual bool getOwnPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot&);
+    virtual bool getOwnPropertySlot(ExecState*, unsigned propertyName, PropertySlot&);
+
+    static JSValue* lengthGetter(ExecState*, const Identifier&, const PropertySlot&);
+    static JSValue* indexGetter(ExecState*, const Identifier&, const PropertySlot&);
+    static JSValue* indexNumericPropertyGetter(ExecState*, unsigned, const PropertySlot&);
+
+    UString m_value;
   };
 
-  // ---------------------------------------------------------------------------
-  //                            Evaluation
-  // ---------------------------------------------------------------------------
+ALWAYS_INLINE bool StringImp::getStringPropertySlot(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);
+    if (isStrictUInt32 && i < static_cast<unsigned>(m_value.size())) {
+        slot.setCustomIndex(this, i, indexGetter);
+        return true;
+    }
+
+    return false;
+}
+    
+ALWAYS_INLINE bool StringImp::getStringPropertySlot(unsigned propertyName, PropertySlot& slot)
+{
+    if (propertyName < static_cast<unsigned>(m_value.size())) {
+        slot.setCustomNumeric(this, indexNumericPropertyGetter);
+        return true;
+    }
+
+    return false;
+}
 
 } // namespace