Changeset 10728 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Oct 4, 2005, 2:33:33 AM (20 years ago)

Author:

eseidel

Message:

Bug #: none
Submitted by: eseidel
Reviewed by: mjs

Code cleanup, which resulted in a small win on iBench.

• kjs/object.cpp: (KJS::tryGetAndCallProperty): new static inline (KJS::ObjectImp::defaultValue): code cleanup

File:

• trunk/JavaScriptCore/kjs/object.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/object.cpp

@@ -278 +278 @@
 }
 
-// ECMA 8.6.2.6
-ValueImp *ObjectImp::defaultValue(ExecState *exec, Type hint) const
-{
-  if (hint != StringType && hint != NumberType) {
-    /* Prefer String for Date objects */
-    if (_proto == exec->lexicalInterpreter()->builtinDatePrototype())
-      hint = StringType;
-    else
-      hint = NumberType;
-  }
-
-  ValueImp *v;
-  if (hint == StringType)
-    v = get(exec,toStringPropertyName);
-  else
-    v = get(exec,valueOfPropertyName);
-
+static inline
+#ifdef __GNUC__
+__attribute__((always_inline))
+#endif
+ValueImp *tryGetAndCallProperty(ExecState *exec, const ObjectImp *object, const Identifier &propertyName) {
+  ValueImp *v = object->get(exec, propertyName);
   if (v->isObject()) {
     ObjectImp *o = static_cast<ObjectImp*>(v);
     if (o->implementsCall()) { // spec says "not primitive type" but ...
-      ObjectImp *thisObj = const_cast<ObjectImp*>(this);
-      ValueImp *def = o->call(exec,thisObj,List::empty());
+      ObjectImp *thisObj = const_cast<ObjectImp*>(object);
+      ValueImp *def = o->call(exec, thisObj, List::empty());
       Type defType = def->type();
       if (defType == UnspecifiedType || defType == UndefinedType ||
@@ -308 +297 @@
     }
   }
-
-  if (hint == StringType)
-    v = get(exec,valueOfPropertyName);
-  else
-    v = get(exec,toStringPropertyName);
-
-  if (v->isObject()) {
-    ObjectImp *o = static_cast<ObjectImp*>(v);
-    if (o->implementsCall()) { // spec says "not primitive type" but ...
-      ObjectImp *thisObj = const_cast<ObjectImp*>(this);
-      ValueImp *def = o->call(exec,thisObj,List::empty());
-      Type defType = def->type();
-      if (defType == UnspecifiedType || defType == UndefinedType ||
-          defType == NullType || defType == BooleanType ||
-          defType == StringType || defType == NumberType) {
-        return def;
-      }
-    }
-  }
+  return NULL;
+}
+
+// ECMA 8.6.2.6
+ValueImp *ObjectImp::defaultValue(ExecState *exec, Type hint) const
+{
+  Identifier firstPropertyName;
+  Identifier secondPropertyName;
+  /* Prefer String for Date objects */
+  if ((hint == StringType) || (hint != StringType) && (hint != NumberType) && (_proto == exec->lexicalInterpreter()->builtinDatePrototype())) {
+    firstPropertyName = toStringPropertyName;
+    secondPropertyName = valueOfPropertyName;
+  } else {
+    firstPropertyName = valueOfPropertyName;
+    secondPropertyName = toStringPropertyName;
+  }
+
+  ValueImp *v;
+  if ((v = tryGetAndCallProperty(exec, this, firstPropertyName)))
+    return v;
+  if ((v = tryGetAndCallProperty(exec, this, secondPropertyName)))
+    return v;
 
   if (exec->hadException())