Changeset 9889 in webkit for trunk/JavaScriptCore/kjs/function.cpp

Timestamp:

Jul 25, 2005, 3:17:20 PM (20 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Darin.

• ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4124 (change JavaScript property access to avoid double lookup)

• 10% speedup on JavaScript iBench
• 5% speedup on 24fun BenchJS benchmark

Changed all get methods to getOwnProperty - they are no longer
responsible for prototype lookup, and determine if the property
was found as a side efect.

get() is now a nonvirtual ObjectImp method which calls the virtual
getOwnProperty and walks the prototype chain. A few selected
methods were inlined.

Changed ResolveNode::evaluate plus some other places to use
getProperty which does get() and hasProperty() in one lookup.

Also miscellaneous code cleanup.

• bindings/objc/objc_runtime.h:
• bindings/objc/objc_runtime.mm: (ObjcFallbackObjectImp::ObjcFallbackObjectImp): (ObjcFallbackObjectImp::getOwnProperty):
• bindings/runtime_array.cpp: (RuntimeArrayImp::RuntimeArrayImp): (RuntimeArrayImp::getOwnProperty):
• bindings/runtime_array.h:
• bindings/runtime_method.cpp: (RuntimeMethodImp::getOwnProperty):
• bindings/runtime_method.h:
• bindings/runtime_object.cpp: (RuntimeObjectImp::getOwnProperty):
• bindings/runtime_object.h:
• kjs/array_instance.h:
• kjs/array_object.cpp: (ArrayInstanceImp::getOwnProperty): (ArrayPrototypeImp::getOwnProperty): (ArrayProtoFuncImp::call):
• kjs/array_object.h:
• kjs/date_object.cpp: (DatePrototypeImp::getOwnProperty):
• kjs/date_object.h:
• kjs/function.cpp: (KJS::FunctionImp::getOwnProperty): (KJS::ArgumentsImp::getOwnProperty): (KJS::ActivationImp::getOwnProperty):
• kjs/function.h:
• kjs/lookup.h: (KJS::lookupGetOwnProperty): (KJS::lookupGetOwnFunction): (KJS::lookupGetOwnValue):
• kjs/math_object.cpp: (MathObjectImp::getOwnProperty): (MathObjectImp::getValueProperty):
• kjs/math_object.h:
• kjs/nodes.cpp: (ResolveNode::evaluate):
• kjs/number_object.cpp: (NumberObjectImp::getOwnProperty):
• kjs/number_object.h:
• kjs/object.cpp: (KJS::ObjectImp::get): (KJS::ObjectImp::getOwnProperty): (KJS::ObjectImp::getProperty):
• kjs/object.h: (KJS::ObjectImp::getProperty): (KJS::ObjectImp::getOwnProperty):
• kjs/object_object.cpp: (ObjectProtoFuncImp::call):
• kjs/regexp_object.cpp: (RegExpObjectImp::getOwnProperty):
• kjs/regexp_object.h:
• kjs/string_object.cpp: (StringInstanceImp::getOwnProperty): (StringPrototypeImp::getOwnProperty):
• kjs/string_object.h:

WebCore:

Reviewed by Darin.

• ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4124 (change JavaScript property access to avoid double lookup)

• 10% speedup on JavaScript iBench
• 5% speedup on 24fun BenchJS benchmark

Changed all get methods to getOwnProperty - they are no longer responsible for
prototype lookup, and determine if the property was found as a side efect.

Also miscellaneous code cleanup.

• khtml/ecma/kjs_css.cpp: (KJS::DOMCSSStyleDeclaration::getOwnProperty): (KJS::DOMStyleSheet::getOwnProperty): (KJS::DOMStyleSheetList::getOwnProperty): (KJS::DOMMediaList::getOwnProperty): (KJS::DOMCSSStyleSheet::getOwnProperty): (KJS::DOMCSSRuleList::getOwnProperty): (KJS::DOMCSSRule::getOwnProperty): (KJS::DOMCSSRule::getValueProperty): (KJS::CSSRuleConstructor::getOwnProperty): (KJS::DOMCSSValue::getOwnProperty): (KJS::CSSValueConstructor::getOwnProperty): (KJS::DOMCSSPrimitiveValue::getOwnProperty): (KJS::CSSPrimitiveValueConstructor::getOwnProperty): (KJS::DOMCSSValueList::getOwnProperty): (KJS::DOMRGBColor::getOwnProperty): (KJS::DOMRect::getOwnProperty): (KJS::DOMCounter::getOwnProperty):
• khtml/ecma/kjs_css.h:
• khtml/ecma/kjs_dom.cpp: (KJS::DOMNode::getOwnProperty): (KJS::DOMNodeList::getOwnProperty): (KJS::DOMAttr::getOwnProperty): (KJS::DOMDocument::getOwnProperty): (KJS::DOMElement::getOwnProperty): (KJS::DOMDocumentType::getOwnProperty): (KJS::DOMNamedNodeMap::getOwnProperty): (KJS::DOMProcessingInstruction::getOwnProperty): (KJS::DOMNotation::getOwnProperty): (KJS::DOMEntity::getOwnProperty): (KJS::NodeConstructor::getOwnProperty): (KJS::DOMExceptionConstructor::getOwnProperty): (KJS::DOMNamedNodesCollection::getOwnProperty): (KJS::DOMCharacterData::getOwnProperty):
• khtml/ecma/kjs_dom.h:
• khtml/ecma/kjs_events.cpp: (KJS::EventConstructor::getOwnProperty): (KJS::DOMEvent::getOwnProperty): (KJS::EventExceptionConstructor::getOwnProperty): (KJS::DOMUIEvent::getOwnProperty): (KJS::DOMMouseEvent::getOwnProperty): (KJS::DOMKeyboardEvent::getOwnProperty): (KJS::MutationEventConstructor::getOwnProperty): (KJS::DOMMutationEvent::getOwnProperty): (KJS::DOMWheelEvent::getOwnProperty): (KJS::Clipboard::getOwnProperty):
• khtml/ecma/kjs_events.h:
• khtml/ecma/kjs_html.cpp: (KJS::HTMLDocument::getOwnProperty): (KJS::KJS::HTMLElement::getOwnProperty): (KJS::KJS::HTMLCollection::getOwnProperty): (KJS::KJS::HTMLSelectCollection::getOwnProperty): (KJS::Image::getOwnProperty): (KJS::Context2D::getOwnProperty): (KJS::Gradient::getOwnProperty): (KJS::ImagePattern::getOwnProperty):
• khtml/ecma/kjs_html.h:
• khtml/ecma/kjs_navigator.cpp: (KJS::Plugin::Plugin): (KJS::Navigator::getOwnProperty): (KJS::Plugins::getOwnProperty): (KJS::MimeTypes::getOwnProperty): (KJS::Plugin::getOwnProperty): (KJS::MimeType::getOwnProperty):
• khtml/ecma/kjs_navigator.h:
• khtml/ecma/kjs_range.cpp: (KJS::DOMRange::getOwnProperty): (KJS::RangeConstructor::getOwnProperty):
• khtml/ecma/kjs_range.h:
• khtml/ecma/kjs_traversal.cpp: (KJS::DOMNodeIterator::getOwnProperty): (KJS::NodeFilterConstructor::getOwnProperty): (KJS::DOMTreeWalker::getOwnProperty):
• khtml/ecma/kjs_traversal.h:
• khtml/ecma/kjs_views.cpp: (KJS::DOMAbstractView::getOwnProperty):
• khtml/ecma/kjs_views.h:
• khtml/ecma/kjs_window.cpp: (KJS::Screen::getOwnProperty): (KJS::Window::~Window): (KJS::Window::getOwnProperty): (KJS::Window::put): (KJS::FrameArray::getOwnProperty): (KJS::Location::Location): (KJS::Location::getOwnProperty): (KJS::Location::put): (KJS::Selection::Selection): (KJS::Selection::getOwnProperty): (KJS::BarInfo::getOwnProperty): (KJS::History::getOwnProperty):
• khtml/ecma/kjs_window.h:
• khtml/ecma/xmlhttprequest.cpp: (KJS::XMLHttpRequest::getOwnProperty):
• khtml/ecma/xmlhttprequest.h:

File:

• trunk/JavaScriptCore/kjs/function.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/function.cpp

@@ -203 +203 @@
 }
 
-Value FunctionImp::get(ExecState *exec, const Identifier &propertyName) const
+bool FunctionImp::getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
 {
     // Find the arguments from the closest context.
@@ -209 +209 @@
         ContextImp *context = exec->_context;
         while (context) {
-            if (context->function() == this)
-                return static_cast<ActivationImp *>
-                    (context->activationObject())->get(exec, propertyName);
-            context = context->callingContext();
+          if (context->function() == this) {
+            result = static_cast<ActivationImp *>(context->activationObject())->get(exec, propertyName);
+            return true;
+          }
+          context = context->callingContext();
         }
-        return Null();
+        result = Null();
+        return true;
     }
     
@@ -225 +227 @@
             p = p->next;
         }
-        return Number(count);
+        result = Number(count);
+        return true;
     }
     
-    return InternalFunctionImp::get(exec, propertyName);
+    return InternalFunctionImp::getOwnProperty(exec, propertyName, result);
 }
 
@@ -441 +444 @@
 }
 
-Value ArgumentsImp::get(ExecState *exec, const Identifier &propertyName) const
+bool ArgumentsImp::getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
 {
   if (indexToNameMap.isMapped(propertyName)) {
-    return _activationObject->get(exec, indexToNameMap[propertyName]);
-  } else {
-    return ObjectImp::get(exec, propertyName);
-  }
+    result = _activationObject->get(exec, indexToNameMap[propertyName]);
+    return true;
+  }
+
+  return ObjectImp::getOwnProperty(exec, propertyName, result);
 }
 
@@ -489 +493 @@
 }
 
-Value ActivationImp::get(ExecState *exec, const Identifier &propertyName) const
-{
+bool ActivationImp::getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
+{
+    // do this first so property map arguments property wins over the below
+    if (ObjectImp::getOwnProperty(exec, propertyName, result))
+        return true;
+
     if (propertyName == argumentsPropertyName) {
-        // check for locally declared arguments property
-        ValueImp *v = getDirect(propertyName);
-        if (v)
-            return Value(v);
-
         // default: return builtin arguments array
         if (!_argumentsObject)
-                createArgumentsObject(exec);
-        return Value(_argumentsObject);
-    }
-    return ObjectImp::get(exec, propertyName);
+            createArgumentsObject(exec);
+
+        result = Value(_argumentsObject);
+        return true;
+    }
+
+    return false;
 }