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

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.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/internal.cpp

@@ -60 +60 @@
 {
     value = this;
-    number = val.toDouble();
-    return false;
-}
-
-bool StringImp::toBoolean(ExecState *) const
-{
-  return (val.size() > 0);
-}
-
-double StringImp::toNumber(ExecState *) const
-{
-  return val.toDouble();
-}
-
-UString StringImp::toString(ExecState *) const
-{
-  return val;
-}
-
-JSObject* StringImp::toObject(ExecState *exec) const
-{
-    return new StringInstance(exec->lexicalGlobalObject()->stringPrototype(), const_cast<StringImp*>(this));
+    number = m_value.toDouble();
+    return false;
+}
+
+bool StringImp::toBoolean(ExecState*) const
+{
+    return !m_value.isEmpty();
+}
+
+double StringImp::toNumber(ExecState*) const
+{
+    return m_value.toDouble();
+}
+
+UString StringImp::toString(ExecState*) const
+{
+    return m_value;
+}
+
+inline StringInstance* StringInstance::create(ExecState* exec, StringImp* string)
+{
+    return new StringInstance(exec->lexicalGlobalObject()->stringPrototype(), string);
+}
+
+JSObject* StringImp::toObject(ExecState* exec) const
+{
+    return StringInstance::create(exec, const_cast<StringImp*>(this));
 }
 
 JSObject* StringImp::toThisObject(ExecState* exec) const
 {
-    return new StringInstance(exec->lexicalGlobalObject()->stringPrototype(), const_cast<StringImp*>(this));
+    return StringInstance::create(exec, const_cast<StringImp*>(this));
+}
+
+JSValue* StringImp::lengthGetter(ExecState*, const Identifier&, const PropertySlot& slot)
+{
+    return jsNumber(static_cast<StringImp*>(slot.slotBase())->value().size());
+}
+
+JSValue* StringImp::indexGetter(ExecState*, const Identifier&, const PropertySlot& slot)
+{
+    return jsString(static_cast<StringImp*>(slot.slotBase())->value().substr(slot.index(), 1));
+}
+
+JSValue* StringImp::indexNumericPropertyGetter(ExecState*, unsigned index, const PropertySlot& slot)
+{
+    return jsString(static_cast<StringImp*>(slot.slotBase())->value().substr(index, 1));
+}
+
+bool StringImp::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
+{
+    // The semantics here are really getPropertySlot, not getOwnPropertySlot.
+    // This function should only be called by JSValue::get.
+    if (getStringPropertySlot(exec, propertyName, slot))
+        return true;
+    JSObject* object = StringInstance::create(exec, this);
+    slot.setBase(object);
+    if (object->JSObject::getOwnPropertySlot(exec, propertyName, slot))
+        return true;
+    while (true) {
+        JSValue* proto = object->prototype();
+        if (!proto->isObject()) {
+            slot.setUndefined();
+            return true;
+        }
+        object = static_cast<JSObject*>(proto);
+        if (object->getOwnPropertySlot(exec, propertyName, slot))
+            return true;
+    }
+}
+
+bool StringImp::getOwnPropertySlot(ExecState* exec, unsigned propertyName, PropertySlot& slot)
+{
+    // The semantics here are really getPropertySlot, not getOwnPropertySlot.
+    // This function should only be called by JSValue::get.
+    if (getStringPropertySlot(propertyName, slot))
+        return true;
+    return StringImp::getOwnPropertySlot(exec, Identifier::from(propertyName), slot);
 }