Changeset 10076 in webkit for trunk/JavaScriptCore

Timestamp:

Aug 6, 2005, 11:17:49 PM (20 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Darin.

Change over to the new PropertySlot mechanism for property
lookup. This allows the elimination of hasOwnProperty
methods. Also did some of the performance tuning enabled by this
(but not yet all the possible improvements for function calls,
assignment, ++, and so forth). And also much code cleanup.

Net result is about a 2% speedup on the JS iBench.

Also redid Geoff's fix for the chrashing applet by avoiding a NULL
prototype in the bindings code and using the default of Null()
instead.

• JavaScriptCore.xcodeproj/project.pbxproj:
• bindings/objc/objc_runtime.h:
• bindings/objc/objc_runtime.mm: (ObjcFallbackObjectImp::ObjcFallbackObjectImp): (ObjcFallbackObjectImp::getOwnPropertySlot):
• bindings/runtime_array.cpp: (RuntimeArrayImp::lengthGetter): (RuntimeArrayImp::indexGetter): (RuntimeArrayImp::getOwnPropertySlot):
• bindings/runtime_array.h:
• bindings/runtime_method.cpp: (RuntimeMethodImp::lengthGetter): (RuntimeMethodImp::getOwnPropertySlot):
• bindings/runtime_method.h:
• bindings/runtime_object.cpp: (RuntimeObjectImp::RuntimeObjectImp): (RuntimeObjectImp::fallbackObjectGetter): (RuntimeObjectImp::fieldGetter): (RuntimeObjectImp::methodGetter): (RuntimeObjectImp::getOwnPropertySlot):
• bindings/runtime_object.h:
• bindings/runtime_root.h:
• kjs/array_instance.h:
• kjs/array_object.cpp: (ArrayInstanceImp::lengthGetter): (ArrayInstanceImp::getOwnPropertySlot): (ArrayPrototypeImp::getOwnPropertySlot):
• kjs/array_object.h:
• kjs/date_object.cpp: (DatePrototypeImp::getOwnPropertySlot):
• kjs/date_object.h:
• kjs/function.cpp: (KJS::FunctionImp::argumentsGetter): (KJS::FunctionImp::lengthGetter): (KJS::FunctionImp::getOwnPropertySlot): (KJS::FunctionImp::put): (KJS::FunctionImp::deleteProperty): (KJS::ArgumentsImp::mappedIndexGetter): (KJS::ArgumentsImp::getOwnPropertySlot): (KJS::ActivationImp::argumentsGetter): (KJS::ActivationImp::getArgumentsGetter): (KJS::ActivationImp::getOwnPropertySlot): (KJS::ActivationImp::deleteProperty):
• kjs/function.h:
• kjs/internal.cpp: (InterpreterImp::InterpreterImp): (InterpreterImp::initGlobalObject): (InterpreterImp::~InterpreterImp): (InterpreterImp::evaluate):
• kjs/internal.h: (KJS::InterpreterImp::globalExec):
• kjs/interpreter.cpp: (Interpreter::Interpreter): (Interpreter::createLanguageInstanceForValue):
• kjs/interpreter.h: (KJS::Interpreter::argumentsIdentifier): (KJS::Interpreter::specialPrototypeIdentifier):
• kjs/lookup.h: (KJS::staticFunctionGetter): (KJS::staticValueGetter): (KJS::getStaticPropertySlot): (KJS::getStaticFunctionSlot): (KJS::getStaticValueSlot):
• kjs/math_object.cpp: (MathObjectImp::getOwnPropertySlot):
• kjs/math_object.h:
• kjs/nodes.cpp: (ResolveNode::evaluate): (ResolveNode::evaluateReference): (AccessorNode1::evaluate): (AccessorNode2::evaluate):
• kjs/number_object.cpp: (NumberObjectImp::getOwnPropertySlot):
• kjs/number_object.h:
• kjs/object.cpp: (KJS::ObjectImp::get): (KJS::ObjectImp::getProperty): (KJS::ObjectImp::getPropertySlot): (KJS::ObjectImp::getOwnPropertySlot): (KJS::ObjectImp::put): (KJS::ObjectImp::hasProperty): (KJS::ObjectImp::hasOwnProperty):
• kjs/object.h: (KJS::ObjectImp::getDirectLocation): (KJS::ObjectImp::getPropertySlot): (KJS::ObjectImp::getOwnPropertySlot):
• kjs/object_wrapper.h: Added. (KJS::): (KJS::Object::Object): (KJS::Object::operator ObjectImp *):
• kjs/property_map.cpp: (KJS::PropertyMap::getLocation):
• kjs/property_map.h:
• kjs/property_slot.cpp: Added. (KJS::PropertySlot::undefinedGetter):
• kjs/property_slot.h: Added. (KJS::PropertySlot::isSet): (KJS::PropertySlot::getValue): (KJS::PropertySlot::setValueSlot): (KJS::PropertySlot::setStaticEntry): (KJS::PropertySlot::setCustom): (KJS::PropertySlot::setCustomIndex): (KJS::PropertySlot::setUndefined): (KJS::PropertySlot::slotBase): (KJS::PropertySlot::staticEntry): (KJS::PropertySlot::index): (KJS::PropertySlot::):
• kjs/protect.h:
• kjs/protected_object.h: Added. (KJS::ProtectedObject::ProtectedObject): (KJS::ProtectedObject::~ProtectedObject): (KJS::ProtectedObject::operator=): (KJS::ProtectedReference::ProtectedReference): (KJS::ProtectedReference::~ProtectedReference): (KJS::ProtectedReference::operator=):
• kjs/reference.h:
• kjs/reference_list.cpp:
• kjs/regexp_object.cpp: (RegExpObjectImp::backrefGetter): (RegExpObjectImp::getOwnPropertySlot):
• kjs/regexp_object.h:
• kjs/string_object.cpp: (StringInstanceImp::lengthGetter): (StringInstanceImp::indexGetter): (StringInstanceImp::getOwnPropertySlot): (StringPrototypeImp::getOwnPropertySlot):
• kjs/string_object.h:

WebCore:

Reviewed by Darin.

Change over to the new PropertySlot mechanism for property
lookup. This allows the elimination of hasOwnProperty methods. I
also did a bunch of code cleanup and regularization of the various
property lookup methods.

Test cases added: Added a test case for a bug I found along the way.

• layout-tests/fast/js/string-index-overflow.html:
• layout-tests/fast/js/string-index-overflow-expected.txt:

• khtml/ecma/kjs_binding.cpp: (KJS::ScriptInterpreter::createLanguageInstanceForValue):
• khtml/ecma/kjs_binding.h:
• khtml/ecma/kjs_css.cpp: (KJS::DOMCSSStyleDeclaration::indexGetter): (KJS::DOMCSSStyleDeclaration::cssPropertyGetter): (KJS::DOMCSSStyleDeclaration::getOwnPropertySlot): (KJS::DOMCSSStyleDeclaration::getValueProperty): (KJS::DOMStyleSheet::getOwnPropertySlot): (KJS::DOMStyleSheetList::getValueProperty): (KJS::DOMStyleSheetList::indexGetter): (KJS::DOMStyleSheetList::nameGetter): (KJS::DOMStyleSheetList::getOwnPropertySlot): (KJS::DOMMediaList::getValueProperty): (KJS::DOMMediaList::indexGetter): (KJS::DOMMediaList::getOwnPropertySlot): (KJS::DOMCSSStyleSheet::getValueProperty): (KJS::DOMCSSStyleSheet::getOwnPropertySlot): (KJS::DOMCSSRuleList::getValueProperty): (KJS::DOMCSSRuleList::indexGetter): (KJS::DOMCSSRuleList::getOwnPropertySlot): (KJS::DOMCSSRule::getOwnPropertySlot): (KJS::CSSRuleConstructor::getOwnPropertySlot): (KJS::DOMCSSValue::getValueProperty): (KJS::DOMCSSValue::getOwnPropertySlot): (KJS::CSSValueConstructor::getOwnPropertySlot): (KJS::DOMCSSPrimitiveValue::getValueProperty): (KJS::DOMCSSPrimitiveValue::getOwnPropertySlot): (KJS::CSSPrimitiveValueConstructor::getOwnPropertySlot): (KJS::DOMCSSValueList::getValueProperty): (KJS::DOMCSSValueList::indexGetter): (KJS::DOMCSSValueList::getOwnPropertySlot): (KJS::DOMRGBColor::getOwnPropertySlot): (KJS::DOMRect::getOwnPropertySlot): (KJS::DOMCounter::getOwnPropertySlot):
• khtml/ecma/kjs_css.h: (KJS::DOMCSSStyleDeclaration::): (KJS::DOMCSSStyleSheet::): (KJS::DOMCSSRule::): (KJS::DOMCSSValueList::):
• khtml/ecma/kjs_dom.cpp: (KJS::DOMNode::getOwnPropertySlot): (KJS::): (KJS::DOMNodeList::getValueProperty): (KJS::DOMNodeList::indexGetter): (KJS::DOMNodeList::nameGetter): (KJS::DOMNodeList::getOwnPropertySlot): (KJS::DOMNodeList::call): (KJS::DOMAttr::getOwnPropertySlot): (KJS::DOMDocument::getOwnPropertySlot): (KJS::DOMElement::getValueProperty): (KJS::DOMElement::attributeGetter): (KJS::DOMElement::getOwnPropertySlot): (KJS::DOMDocumentType::getOwnPropertySlot): (KJS::DOMNamedNodeMap::lengthGetter): (KJS::DOMNamedNodeMap::indexGetter): (KJS::DOMNamedNodeMap::getOwnPropertySlot): (KJS::DOMProcessingInstruction::getOwnPropertySlot): (KJS::DOMNotation::getOwnPropertySlot): (KJS::DOMEntity::getOwnPropertySlot): (KJS::NodeConstructor::getOwnPropertySlot): (KJS::DOMExceptionConstructor::getOwnPropertySlot): (KJS::DOMNamedNodesCollection::lengthGetter): (KJS::DOMNamedNodesCollection::indexGetter): (KJS::DOMNamedNodesCollection::getOwnPropertySlot): (KJS::DOMCharacterData::getOwnPropertySlot):
• khtml/ecma/kjs_dom.h:
• khtml/ecma/kjs_events.cpp: (KJS::EventConstructor::getOwnPropertySlot): (KJS::DOMEvent::getOwnPropertySlot): (KJS::EventExceptionConstructor::getOwnPropertySlot): (KJS::DOMUIEvent::getOwnPropertySlot): (KJS::DOMMouseEvent::getOwnPropertySlot): (KJS::DOMKeyboardEvent::getOwnPropertySlot): (KJS::MutationEventConstructor::getOwnPropertySlot): (KJS::DOMMutationEvent::getOwnPropertySlot): (KJS::DOMWheelEvent::getOwnPropertySlot): (KJS::Clipboard::getOwnPropertySlot):
• khtml/ecma/kjs_events.h:
• khtml/ecma/kjs_html.cpp: (KJS::HTMLDocument::namedItemGetter): (KJS::HTMLDocument::getValueProperty): (KJS::HTMLDocument::getOwnPropertySlot): (KJS::HTMLElement::formIndexGetter): (KJS::HTMLElement::formNameGetter): (KJS::HTMLElement::selectIndexGetter): (KJS::HTMLElement::framesetNameGetter): (KJS::HTMLElement::frameWindowPropertyGetter): (KJS::HTMLElement::runtimeObjectGetter): (KJS::HTMLElement::runtimeObjectPropertyGetter): (KJS::HTMLElement::getOwnPropertySlot): (KJS::HTMLCollection::lengthGetter): (KJS::HTMLCollection::indexGetter): (KJS::HTMLCollection::nameGetter): (KJS::HTMLCollection::getOwnPropertySlot): (KJS::HTMLSelectCollection::selectedIndexGetter): (KJS::HTMLSelectCollection::getOwnPropertySlot): (KJS::Image::getOwnPropertySlot): (KJS::Context2D::getOwnPropertySlot): (KJS::Gradient::getOwnPropertySlot): (KJS::ImagePattern::getOwnPropertySlot):
• khtml/ecma/kjs_html.h: (KJS::HTMLCollection::toBoolean):
• khtml/ecma/kjs_navigator.cpp: (KJS::Plugins::): (KJS::MimeTypes::): (KJS::Plugin::): (KJS::MimeType::): (KJS::): (KJS::Navigator::getOwnPropertySlot): (KJS::Plugins::getValueProperty): (KJS::Plugins::indexGetter): (KJS::Plugins::nameGetter): (KJS::Plugins::getOwnPropertySlot): (KJS::MimeTypes::getValueProperty): (KJS::MimeTypes::indexGetter): (KJS::MimeTypes::nameGetter): (KJS::MimeTypes::getOwnPropertySlot): (KJS::Plugin::getValueProperty): (KJS::Plugin::indexGetter): (KJS::Plugin::nameGetter): (KJS::Plugin::getOwnPropertySlot): (KJS::MimeType::getValueProperty): (KJS::MimeType::getOwnPropertySlot):
• khtml/ecma/kjs_navigator.h:
• khtml/ecma/kjs_range.cpp: (KJS::DOMRange::getOwnPropertySlot): (KJS::RangeConstructor::getOwnPropertySlot):
• khtml/ecma/kjs_range.h:
• khtml/ecma/kjs_traversal.cpp: (KJS::DOMNodeIterator::getOwnPropertySlot): (KJS::NodeFilterConstructor::getOwnPropertySlot): (KJS::DOMTreeWalker::getOwnPropertySlot):
• khtml/ecma/kjs_traversal.h:
• khtml/ecma/kjs_views.cpp: (KJS::DOMAbstractView::~DOMAbstractView): (KJS::DOMAbstractView::getValueProperty): (KJS::DOMAbstractView::getOwnPropertySlot):
• khtml/ecma/kjs_views.h:
• khtml/ecma/kjs_window.cpp: (KJS::FrameArray::): (KJS::FrameArray::classInfo): (KJS::Screen::getOwnPropertySlot): (KJS::Window::getValueProperty): (KJS::Window::childFrameGetter): (KJS::Window::namedFrameGetter): (KJS::Window::indexGetter): (KJS::Window::namedItemGetter): (KJS::Window::getOwnPropertySlot): (KJS::): (KJS::FrameArray::getValueProperty): (KJS::FrameArray::indexGetter): (KJS::FrameArray::nameGetter): (KJS::FrameArray::getOwnPropertySlot): (KJS::Location::getValueProperty): (KJS::Location::getOwnPropertySlot): (KJS::Selection::getValueProperty): (KJS::Selection::getOwnPropertySlot): (KJS::BarInfo::getValueProperty): (KJS::BarInfo::getOwnPropertySlot): (KJS::History::getOwnPropertySlot):
• khtml/ecma/kjs_window.h:
• khtml/ecma/xmlhttprequest.cpp: (KJS::XMLHttpRequest::getOwnPropertySlot):
• khtml/ecma/xmlhttprequest.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (11 diffs)
• bindings/objc/objc_runtime.h (modified) (2 diffs)
• bindings/objc/objc_runtime.mm (modified) (3 diffs)
• bindings/runtime_array.cpp (modified) (3 diffs)
• bindings/runtime_array.h (modified) (2 diffs)
• bindings/runtime_method.cpp (modified) (1 diff)
• bindings/runtime_method.h (modified) (2 diffs)
• bindings/runtime_object.cpp (modified) (5 diffs)
• bindings/runtime_object.h (modified) (3 diffs)
• bindings/runtime_root.h (modified) (1 diff)
• kjs/array_instance.h (modified) (2 diffs)
• kjs/array_object.cpp (modified) (5 diffs)
• kjs/array_object.h (modified) (1 diff)
• kjs/date_object.cpp (modified) (1 diff)
• kjs/date_object.h (modified) (1 diff)
• kjs/function.cpp (modified) (6 diffs)
• kjs/function.h (modified) (5 diffs)
• kjs/internal.cpp (modified) (10 diffs)
• kjs/internal.h (modified) (3 diffs)
• kjs/interpreter.cpp (modified) (4 diffs)
• kjs/interpreter.h (modified) (5 diffs)
• kjs/lookup.h (modified) (4 diffs)
• kjs/math_object.cpp (modified) (1 diff)
• kjs/math_object.h (modified) (1 diff)
• kjs/nodes.cpp (modified) (4 diffs)
• kjs/number_object.cpp (modified) (1 diff)
• kjs/number_object.h (modified) (1 diff)
• kjs/object.cpp (modified) (3 diffs)
• kjs/object.h (modified) (9 diffs)
• kjs/object_wrapper.h (added)
• kjs/property_map.cpp (modified) (1 diff)
• kjs/property_map.h (modified) (1 diff)
• kjs/property_slot.cpp (added)
• kjs/property_slot.h (added)
• kjs/protect.h (modified) (2 diffs)
• kjs/protected_object.h (added)
• kjs/reference.h (modified) (1 diff)
• kjs/reference_list.cpp (modified) (1 diff)
• kjs/regexp_object.cpp (modified) (2 diffs)
• kjs/regexp_object.h (modified) (1 diff)
• kjs/string_object.cpp (modified) (4 diffs)
• kjs/string_object.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2005-08-06  Maciej Stachowiak  <[email protected]>
+
+        Reviewed by Darin.
+
+        Change over to the new PropertySlot mechanism for property
+        lookup. This allows the elimination of hasOwnProperty
+        methods. Also did some of the performance tuning enabled by this
+        (but not yet all the possible improvements for function calls,
+        assignment, ++, and so forth). And also much code cleanup.
+
+        Net result is about a 2% speedup on the JS iBench.
+        
+        Also redid Geoff's fix for the chrashing applet by avoiding a NULL
+        prototype in the bindings code and using the default of Null()
+        instead.
+        
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * bindings/objc/objc_runtime.h:
+        * bindings/objc/objc_runtime.mm:
+        (ObjcFallbackObjectImp::ObjcFallbackObjectImp):
+        (ObjcFallbackObjectImp::getOwnPropertySlot):
+        * bindings/runtime_array.cpp:
+        (RuntimeArrayImp::lengthGetter):
+        (RuntimeArrayImp::indexGetter):
+        (RuntimeArrayImp::getOwnPropertySlot):
+        * bindings/runtime_array.h:
+        * bindings/runtime_method.cpp:
+        (RuntimeMethodImp::lengthGetter):
+        (RuntimeMethodImp::getOwnPropertySlot):
+        * bindings/runtime_method.h:
+        * bindings/runtime_object.cpp:
+        (RuntimeObjectImp::RuntimeObjectImp):
+        (RuntimeObjectImp::fallbackObjectGetter):
+        (RuntimeObjectImp::fieldGetter):
+        (RuntimeObjectImp::methodGetter):
+        (RuntimeObjectImp::getOwnPropertySlot):
+        * bindings/runtime_object.h:
+        * bindings/runtime_root.h:
+        * kjs/array_instance.h:
+        * kjs/array_object.cpp:
+        (ArrayInstanceImp::lengthGetter):
+        (ArrayInstanceImp::getOwnPropertySlot):
+        (ArrayPrototypeImp::getOwnPropertySlot):
+        * kjs/array_object.h:
+        * kjs/date_object.cpp:
+        (DatePrototypeImp::getOwnPropertySlot):
+        * kjs/date_object.h:
+        * kjs/function.cpp:
+        (KJS::FunctionImp::argumentsGetter):
+        (KJS::FunctionImp::lengthGetter):
+        (KJS::FunctionImp::getOwnPropertySlot):
+        (KJS::FunctionImp::put):
+        (KJS::FunctionImp::deleteProperty):
+        (KJS::ArgumentsImp::mappedIndexGetter):
+        (KJS::ArgumentsImp::getOwnPropertySlot):
+        (KJS::ActivationImp::argumentsGetter):
+        (KJS::ActivationImp::getArgumentsGetter):
+        (KJS::ActivationImp::getOwnPropertySlot):
+        (KJS::ActivationImp::deleteProperty):
+        * kjs/function.h:
+        * kjs/internal.cpp:
+        (InterpreterImp::InterpreterImp):
+        (InterpreterImp::initGlobalObject):
+        (InterpreterImp::~InterpreterImp):
+        (InterpreterImp::evaluate):
+        * kjs/internal.h:
+        (KJS::InterpreterImp::globalExec):
+        * kjs/interpreter.cpp:
+        (Interpreter::Interpreter):
+        (Interpreter::createLanguageInstanceForValue):
+        * kjs/interpreter.h:
+        (KJS::Interpreter::argumentsIdentifier):
+        (KJS::Interpreter::specialPrototypeIdentifier):
+        * kjs/lookup.h:
+        (KJS::staticFunctionGetter):
+        (KJS::staticValueGetter):
+        (KJS::getStaticPropertySlot):
+        (KJS::getStaticFunctionSlot):
+        (KJS::getStaticValueSlot):
+        * kjs/math_object.cpp:
+        (MathObjectImp::getOwnPropertySlot):
+        * kjs/math_object.h:
+        * kjs/nodes.cpp:
+        (ResolveNode::evaluate):
+        (ResolveNode::evaluateReference):
+        (AccessorNode1::evaluate):
+        (AccessorNode2::evaluate):
+        * kjs/number_object.cpp:
+        (NumberObjectImp::getOwnPropertySlot):
+        * kjs/number_object.h:
+        * kjs/object.cpp:
+        (KJS::ObjectImp::get):
+        (KJS::ObjectImp::getProperty):
+        (KJS::ObjectImp::getPropertySlot):
+        (KJS::ObjectImp::getOwnPropertySlot):
+        (KJS::ObjectImp::put):
+        (KJS::ObjectImp::hasProperty):
+        (KJS::ObjectImp::hasOwnProperty):
+        * kjs/object.h:
+        (KJS::ObjectImp::getDirectLocation):
+        (KJS::ObjectImp::getPropertySlot):
+        (KJS::ObjectImp::getOwnPropertySlot):
+        * kjs/object_wrapper.h: Added.
+        (KJS::):
+        (KJS::Object::Object):
+        (KJS::Object::operator ObjectImp *):
+        * kjs/property_map.cpp:
+        (KJS::PropertyMap::getLocation):
+        * kjs/property_map.h:
+        * kjs/property_slot.cpp: Added.
+        (KJS::PropertySlot::undefinedGetter):
+        * kjs/property_slot.h: Added.
+        (KJS::PropertySlot::isSet):
+        (KJS::PropertySlot::getValue):
+        (KJS::PropertySlot::setValueSlot):
+        (KJS::PropertySlot::setStaticEntry):
+        (KJS::PropertySlot::setCustom):
+        (KJS::PropertySlot::setCustomIndex):
+        (KJS::PropertySlot::setUndefined):
+        (KJS::PropertySlot::slotBase):
+        (KJS::PropertySlot::staticEntry):
+        (KJS::PropertySlot::index):
+        (KJS::PropertySlot::):
+        * kjs/protect.h:
+        * kjs/protected_object.h: Added.
+        (KJS::ProtectedObject::ProtectedObject):
+        (KJS::ProtectedObject::~ProtectedObject):
+        (KJS::ProtectedObject::operator=):
+        (KJS::ProtectedReference::ProtectedReference):
+        (KJS::ProtectedReference::~ProtectedReference):
+        (KJS::ProtectedReference::operator=):
+        * kjs/reference.h:
+        * kjs/reference_list.cpp:
+        * kjs/regexp_object.cpp:
+        (RegExpObjectImp::backrefGetter):
+        (RegExpObjectImp::getOwnPropertySlot):
+        * kjs/regexp_object.h:
+        * kjs/string_object.cpp:
+        (StringInstanceImp::lengthGetter):
+        (StringInstanceImp::indexGetter):
+        (StringInstanceImp::getOwnPropertySlot):
+        (StringPrototypeImp::getOwnPropertySlot):
+        * kjs/string_object.h:
+
 2005-08-05  Adele Peterson  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -26 +26 @@
 
 /* Begin PBXBuildFile section */
+                65305EAF08A58DDE00F31E73 /* protected_object.h in Headers */ = {isa = PBXBuildFile; fileRef = 65305EAE08A58DDE00F31E73 /* protected_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                65305EB008A58E0900F31E73 /* protected_object.h in Headers */ = {isa = PBXBuildFile; fileRef = 65305EAE08A58DDE00F31E73 /* protected_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                6539AACB08A3225A00223EE2 /* object_wrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 6539AACA08A3225A00223EE2 /* object_wrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                65621E6D089E859700760F35 /* property_slot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65621E6B089E859700760F35 /* property_slot.cpp */; };
+                65621E6E089E859700760F35 /* property_slot.h in Headers */ = {isa = PBXBuildFile; fileRef = 65621E6C089E859700760F35 /* property_slot.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                65621E6F089E85D300760F35 /* property_slot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65621E6B089E859700760F35 /* property_slot.cpp */; };
+                65621E70089E85D300760F35 /* property_slot.h in Headers */ = {isa = PBXBuildFile; fileRef = 65621E6C089E859700760F35 /* property_slot.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                65BBAEE008A329B300357728 /* object_wrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 6539AACA08A3225A00223EE2 /* object_wrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 932F5B400822A1C700736975 /* array_object.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A84E0255597D01FF60F7 /* array_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 932F5B420822A1C700736975 /* collector.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8530255597D01FF60F7 /* collector.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -450 +458 @@
                 651F6412039D5B5F0078395C /* dtoa.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = dtoa.cpp; sourceTree = "<group>"; };
                 651F6413039D5B5F0078395C /* dtoa.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dtoa.h; sourceTree = "<group>"; };
+                65305EAE08A58DDE00F31E73 /* protected_object.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = protected_object.h; sourceTree = "<group>"; };
+                6539AACA08A3225A00223EE2 /* object_wrapper.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = object_wrapper.h; sourceTree = "<group>"; };
                 65417205039E02E70058BFEB /* get.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = get.c; path = pcre/get.c; sourceTree = "<group>"; };
                 65417206039E02E70058BFEB /* maketables.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = maketables.c; path = pcre/maketables.c; sourceTree = "<group>"; };
@@ -459 +469 @@
                 6560A4CF04B3B3E7008AE952 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
                 6560A63D04B3B69F008AE952 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
+                65621E6B089E859700760F35 /* property_slot.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = property_slot.cpp; sourceTree = "<group>"; };
+                65621E6C089E859700760F35 /* property_slot.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = property_slot.h; sourceTree = "<group>"; };
                 65AB004806261CBA0076DE63 /* interpreter_map.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = interpreter_map.cpp; sourceTree = "<group>"; };
                 65AB004906261CBA0076DE63 /* interpreter_map.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = interpreter_map.h; sourceTree = "<group>"; };
@@ -633 +645 @@
                         isa = PBXGroup;
                         children = (
+                                65305EAE08A58DDE00F31E73 /* protected_object.h */,
+                                6539AACA08A3225A00223EE2 /* object_wrapper.h */,
+                                65621E6B089E859700760F35 /* property_slot.cpp */,
+                                65621E6C089E859700760F35 /* property_slot.h */,
                                 938772E5038BFE19008635CE /* array_instance.h */,
                                 650B68D80639033F009D42DE /* protected_values.cpp */,
@@ -829 +845 @@
                         buildActionMask = 2147483647;
                         files = (
+                                65305EAF08A58DDE00F31E73 /* protected_object.h in Headers */,
                                 932F5B400822A1C700736975 /* array_object.h in Headers */,
                                 932F5B420822A1C700736975 /* collector.h in Headers */,
@@ -901 +918 @@
                                 932F5B8F0822A1C700736975 /* fast_malloc.h in Headers */,
                                 932FC11D0824A6A3005B3C75 /* create_hash_table in Headers */,
+                                65621E6E089E859700760F35 /* property_slot.h in Headers */,
+                                6539AACB08A3225A00223EE2 /* object_wrapper.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -908 +927 @@
                         buildActionMask = 2147483647;
                         files = (
+                                65305EB008A58E0900F31E73 /* protected_object.h in Headers */,
                                 A85D81F8087B2822006A9172 /* array_object.h in Headers */,
                                 A85D81F9087B2822006A9172 /* collector.h in Headers */,
@@ -923 +943 @@
                                 A85D8205087B2822006A9172 /* number_object.h in Headers */,
                                 A85D8206087B2822006A9172 /* object_object.h in Headers */,
+                                65BBAEE008A329B300357728 /* object_wrapper.h in Headers */,
                                 A85D8207087B2822006A9172 /* object.h in Headers */,
                                 A85D8208087B2822006A9172 /* operations.h in Headers */,
@@ -979 +1000 @@
                                 A85D823D087B2822006A9172 /* npruntime_impl.h in Headers */,
                                 A85D823E087B2822006A9172 /* fast_malloc.h in Headers */,
+                                65621E70089E85D300760F35 /* property_slot.h in Headers */,
                                 A85D823F087B2822006A9172 /* create_hash_table in Headers */,
                         );
@@ -1530 +1552 @@
                                 932F5BD00822A1C700736975 /* softlinking.c in Sources */,
                                 932F5BD10822A1C700736975 /* fast_malloc.cpp in Sources */,
+                                65621E6D089E859700760F35 /* property_slot.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -1617 +1640 @@
                                 A85D827F087B2822006A9172 /* softlinking.c in Sources */,
                                 A85D8280087B2822006A9172 /* fast_malloc.cpp in Sources */,
+                                65621E6F089E85D300760F35 /* property_slot.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/JavaScriptCore/bindings/objc/objc_runtime.h

@@ -170 +170 @@
     const ClassInfo *classInfo() const { return &info; }
 
-    virtual bool getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const;
+    virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
 
     virtual void put(ExecState *exec, const Identifier &propertyName,
@@ -180 +180 @@
     virtual Value call(ExecState *exec, Object &thisObj, const List &args);
 
-    virtual bool hasOwnProperty(ExecState *exec,
-                             const Identifier &propertyName) const;
-
-
-    virtual bool deleteProperty(ExecState *exec,
-                                const Identifier &propertyName);
+    virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
 
     virtual Value defaultValue(ExecState *exec, Type hint) const;

trunk/JavaScriptCore/bindings/objc/objc_runtime.mm

@@ -263 +263 @@
 
 ObjcFallbackObjectImp::ObjcFallbackObjectImp(ObjcInstance *i, const KJS::Identifier propertyName)
-    : ObjectImp ((ObjectImp *)0)
 {
     _instance = i;
@@ -269 +268 @@
 }
 
-bool ObjcFallbackObjectImp::getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
+bool ObjcFallbackObjectImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
 {
     // keep the prototype from getting called instead of just returning false
-    result = Undefined();
+    slot.setUndefined(this);
     return true;
 }
@@ -336 +335 @@
 }
 
-bool ObjcFallbackObjectImp::hasOwnProperty(ExecState *exec,
-                         const Identifier &propertyName) const
-{
-    return false;
-}
-
 bool ObjcFallbackObjectImp::deleteProperty(ExecState *exec,
                             const Identifier &propertyName)

trunk/JavaScriptCore/bindings/runtime_array.cpp

@@ -44 +44 @@
 }
 
-bool RuntimeArrayImp::getOwnProperty(ExecState *exec, const Identifier &propertyName, Value& result) const
+Value RuntimeArrayImp::lengthGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+{
+    RuntimeArrayImp *thisObj = static_cast<RuntimeArrayImp *>(slot.slotBase());
+    return Number(thisObj->getLength());
+}
+
+Value RuntimeArrayImp::indexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+{
+    RuntimeArrayImp *thisObj = static_cast<RuntimeArrayImp *>(slot.slotBase());
+    return thisObj->getConcreteArray()->valueAt(exec, slot.index());
+}
+
+bool RuntimeArrayImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
 {
     if (propertyName == lengthPropertyName) {
-        result = Number(getLength());
+        slot.setCustom(this, lengthGetter);
         return true;
     }
@@ -54 +66 @@
     unsigned index = propertyName.toArrayIndex(&ok);
     if (ok) {
-        if (index >= getLength())
-            result =  Undefined();
-        else
-            result = getConcreteArray()->valueAt(exec, index);
+        if (index < getLength()) {
+            slot.setCustomIndex(this, index, indexGetter);
+            return true;
+        }
+    }
+    
+    return ArrayInstanceImp::getOwnPropertySlot(exec, propertyName, slot);
+}
+
+bool RuntimeArrayImp::getOwnPropertySlot(ExecState *exec, unsigned index, PropertySlot& slot)
+{
+    if (index < getLength()) {
+        slot.setCustomIndex(this, index, indexGetter);
         return true;
     }
     
-    return ArrayInstanceImp::getOwnProperty(exec, propertyName, result);
-}
-
-bool RuntimeArrayImp::getOwnProperty(ExecState *exec, unsigned index, Value& result) const
-{
-    if (index >= getLength())
-        result = Undefined();
-    else
-        result = getConcreteArray()->valueAt(exec, index);
-    
-    return true;
+    return ArrayInstanceImp::getOwnPropertySlot(exec, index, slot);
 }
 
@@ -103 +114 @@
 }
 
-
-bool RuntimeArrayImp::hasOwnProperty(ExecState *exec, const Identifier &propertyName) const
-{
-    if (propertyName == lengthPropertyName)
-        return true;
-    
-    bool ok;
-    unsigned index = propertyName.toArrayIndex(&ok);
-    if (ok) {
-        if (index >= getLength())
-            return false;
-        return true;
-    }
-    
-    return ObjectImp::hasOwnProperty(exec, propertyName);
-}
-
-bool RuntimeArrayImp::hasOwnProperty(ExecState *exec, unsigned index) const
-{
-    if (index >= getLength())
-        return false;
-    return true;
-}
-
 bool RuntimeArrayImp::deleteProperty(ExecState *exec, const Identifier &propertyName)
 {

trunk/JavaScriptCore/bindings/runtime_array.h

@@ -38 +38 @@
     ~RuntimeArrayImp();
     
-    virtual bool getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const;
-    virtual bool getOwnProperty(ExecState *exec, unsigned index, Value& result) const ;
+    virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
+    virtual bool getOwnPropertySlot(ExecState *, unsigned, PropertySlot&);
     virtual void put(ExecState *exec, const Identifier &propertyName, const Value &value, int attr = None);
     virtual void put(ExecState *exec, unsigned propertyName, const Value &value, int attr = None);
     
-    virtual bool hasOwnProperty(ExecState *exec, const Identifier &propertyName) const;
-    virtual bool hasOwnProperty(ExecState *exec, unsigned propertyName) const;
     virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
     virtual bool deleteProperty(ExecState *exec, unsigned propertyName);
@@ -57 +55 @@
 
 private:
+    static Value lengthGetter(ExecState *, const Identifier&, const PropertySlot&);
+    static Value indexGetter(ExecState *, const Identifier&, const PropertySlot&);
+
     Bindings::Array *_array;
 };

trunk/JavaScriptCore/bindings/runtime_method.cpp

@@ -41 +41 @@
 }
 
-bool RuntimeMethodImp::getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
+Value RuntimeMethodImp::lengthGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
 {
-    // Compute length of parameters.
+    RuntimeMethodImp *thisObj = static_cast<RuntimeMethodImp *>(slot.slotBase());
+
+    // Ick!  There may be more than one method with this name.  Arbitrarily
+    // just pick the first method.  The fundamental problem here is that 
+    // JavaScript doesn't have the notion of method overloading and
+    // Java does.
+    // FIXME: a better solution might be to give the maximum number of parameters
+    // of any method
+    return Number(thisObj->_methodList.methodAt(0)->numParameters());
+}
+
+bool RuntimeMethodImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot &slot)
+{
     if (propertyName == lengthPropertyName) {
-        // Ick!  There may be more than one method with this name.  Arbitrarily
-        // just pick the first method.  The fundamental problem here is that 
-        // JavaScript doesn't have the notion of method overloading and
-        // Java does.
-        result = Number(_methodList.methodAt(0)->numParameters());
-        return result;
+        slot.setCustom(this, lengthGetter);
+        return true;
     }
     
-    return FunctionImp::getOwnProperty(exec, propertyName, result);
+    return FunctionImp::getOwnPropertySlot(exec, propertyName, slot);
 }
 

trunk/JavaScriptCore/bindings/runtime_method.h

@@ -39 +39 @@
     virtual ~RuntimeMethodImp();
 
-    virtual bool getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const;
+    virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
 
     virtual bool implementsCall() const;
@@ -49 +49 @@
 
 private:
+    static Value lengthGetter(ExecState *, const Identifier&, const PropertySlot&);
+
     Bindings::MethodList _methodList;
 };

trunk/JavaScriptCore/bindings/runtime_object.cpp

@@ -55 +55 @@
 }
 
-RuntimeObjectImp::RuntimeObjectImp(Bindings::Instance *i, bool oi) : ObjectImp ((ObjectImp *)0)
+RuntimeObjectImp::RuntimeObjectImp(Bindings::Instance *i, bool oi)
 {
     ownsInstance = oi;
@@ -61 +61 @@
 }
 
-bool RuntimeObjectImp::getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
+Value RuntimeObjectImp::fallbackObjectGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+{
+    RuntimeObjectImp *thisObj = static_cast<RuntimeObjectImp *>(slot.slotBase());
+    Bindings::Instance *instance = thisObj->instance;
+
+    instance->begin();
+
+    Class *aClass = instance->getClass();
+    Value result = aClass->fallbackObject(exec, instance, propertyName);
+
+    instance->end();
+            
+    return result;
+}
+
+Value RuntimeObjectImp::fieldGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+{
+    RuntimeObjectImp *thisObj = static_cast<RuntimeObjectImp *>(slot.slotBase());
+    Bindings::Instance *instance = thisObj->instance;
+
+    instance->begin();
+
+    Class *aClass = instance->getClass();
+    Field *aField = aClass->fieldNamed(propertyName.ascii(), instance);
+    Value result = instance->getValueOfField(exec, aField); 
+    
+    instance->end();
+            
+    return result;
+}
+
+Value RuntimeObjectImp::methodGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+{
+    RuntimeObjectImp *thisObj = static_cast<RuntimeObjectImp *>(slot.slotBase());
+    Bindings::Instance *instance = thisObj->instance;
+
+    instance->begin();
+
+    Class *aClass = instance->getClass();
+    MethodList methodList = aClass->methodsNamed(propertyName.ascii(), instance);
+    Value result = Object(new RuntimeMethodImp(exec, propertyName, methodList));
+
+    instance->end();
+            
+    return result;
+}
+
+bool RuntimeObjectImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
 {
     instance->begin();
@@ -68 +115 @@
     
     if (aClass) {
-        // See if the instance have a field with the specified name.
+        // See if the instance has a field with the specified name.
         Field *aField = aClass->fieldNamed(propertyName.ascii(), instance);
         if (aField) {
-            result = instance->getValueOfField(exec, aField); 
+            slot.setCustom(this, fieldGetter);
+            instance->end();
             return true;
         } else {
@@ -78 +126 @@
             MethodList methodList = aClass->methodsNamed(propertyName.ascii(), instance);
             if (methodList.length() > 0) {
-                result = Object(new RuntimeMethodImp(exec, propertyName, methodList));
+                slot.setCustom(this, methodGetter);
+                instance->end();
                 return true;
             }
         }
         
-        if (result.type() == UndefinedType) {
-            // Try a fallback object.
-            result = aClass->fallbackObject(exec, instance, propertyName);
+        // Try a fallback object.
+        if (!aClass->fallbackObject(exec, instance, propertyName).type() != UndefinedType) {
+            slot.setCustom(this, fallbackObjectGetter);
+            instance->end();
             return true;
         }
@@ -131 +181 @@
 }
 
-bool RuntimeObjectImp::hasOwnProperty(ExecState *exec,
-                            const Identifier &propertyName) const
-{
-    bool result = false;
-    
-    instance->begin();
-
-    Field *aField = instance->getClass()->fieldNamed(propertyName.ascii(), instance);
-    if (aField) {
-        instance->end();
-        return true;
-    }
-        
-    MethodList methodList = instance->getClass()->methodsNamed(propertyName.ascii(), instance);
-
-    instance->end();
-
-    if (methodList.length() > 0)
-        return true;
-
-    return result;
-}
-
 bool RuntimeObjectImp::deleteProperty(ExecState *exec,
                             const Identifier &propertyName)

trunk/JavaScriptCore/bindings/runtime_object.h

@@ -42 +42 @@
     const ClassInfo *classInfo() const { return &info; }
 
-    virtual bool getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const;
+    virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
 
     virtual void put(ExecState *exec, const Identifier &propertyName,
@@ -48 +48 @@
 
     virtual bool canPut(ExecState *exec, const Identifier &propertyName) const;
-
-    virtual bool hasOwnProperty(ExecState *exec,
-                             const Identifier &propertyName) const;
-
 
     virtual bool deleteProperty(ExecState *exec,
@@ -67 +63 @@
 
 private:
+    static Value fallbackObjectGetter(ExecState *, const Identifier&, const PropertySlot&);
+    static Value fieldGetter(ExecState *, const Identifier&, const PropertySlot&);
+    static Value methodGetter(ExecState *, const Identifier&, const PropertySlot&);
+
     Bindings::Instance *instance;
     bool ownsInstance;

trunk/JavaScriptCore/bindings/runtime_root.h

@@ -28 +28 @@
 #include <JavaScriptCore/interpreter.h>
 #include <JavaScriptCore/object.h>
+#include <JavaScriptCore/protect.h>
 #include <JavaScriptCore/jni_jsobject.h>
 

trunk/JavaScriptCore/kjs/array_instance.h

@@ -34 +34 @@
     ~ArrayInstanceImp();
 
-    virtual bool getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const;
-    virtual bool getOwnProperty(ExecState *exec, unsigned index, Value& result) const;
+    virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
+    virtual bool getOwnPropertySlot(ExecState *, unsigned, PropertySlot&);
     virtual void put(ExecState *exec, const Identifier &propertyName, const Value &value, int attr = None);
     virtual void put(ExecState *exec, unsigned propertyName, const Value &value, int attr = None);
-    virtual bool hasOwnProperty(ExecState *exec, const Identifier &propertyName) const;
-    virtual bool hasOwnProperty(ExecState *exec, unsigned propertyName) const;
     virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
     virtual bool deleteProperty(ExecState *exec, unsigned propertyName);
@@ -55 +53 @@
     
   private:
+    static Value lengthGetter(ExecState *, const Identifier&, const PropertySlot&);
+
     void setLength(unsigned newLength, ExecState *exec);
     

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -71 +71 @@
 }
 
-bool ArrayInstanceImp::getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
+Value ArrayInstanceImp::lengthGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+{
+  return Number(static_cast<ArrayInstanceImp *>(slot.slotBase())->length);
+}
+
+bool ArrayInstanceImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
 {
   if (propertyName == lengthPropertyName) {
-    result = Number(length);
+    slot.setCustom(this, lengthGetter);
     return true;
   }
@@ -87 +92 @@
       if (!v || v == UndefinedImp::staticUndefined)
         return false;
-
-      result = Value(v);
+      
+      slot.setValueSlot(this, &storage[index]);
       return true;
     }
   }
 
-  return ObjectImp::getOwnProperty(exec, propertyName, result);
-}
-
-bool ArrayInstanceImp::getOwnProperty(ExecState *exec, unsigned index, Value& result) const
+  return ObjectImp::getOwnPropertySlot(exec, propertyName, slot);
+}
+
+bool ArrayInstanceImp::getOwnPropertySlot(ExecState *exec, unsigned index, PropertySlot& slot)
 {
   if (index >= length)
@@ -104 +109 @@
     if (!v || v == UndefinedImp::staticUndefined)
       return false;
-
-    result = Value(v);
+    
+    slot.setValueSlot(this, &storage[index]);
     return true;
   }
-  
-  return ObjectImp::getOwnProperty(exec, Identifier::from(index), result);
+
+  return ObjectImp::getOwnPropertySlot(exec, index, slot);
 }
 
@@ -147 +152 @@
   assert(index >= sparseArrayCutoff);
   ObjectImp::put(exec, Identifier::from(index), value, attr);
-}
-
-bool ArrayInstanceImp::hasOwnProperty(ExecState *exec, const Identifier &propertyName) const
-{
-  if (propertyName == lengthPropertyName)
-    return true;
-  
-  bool ok;
-  unsigned index = propertyName.toArrayIndex(&ok);
-  if (ok) {
-    if (index >= length)
-      return false;
-    if (index < storageLength) {
-      ValueImp *v = storage[index];
-      return v && v != UndefinedImp::staticUndefined;
-    }
-  }
-  
-  return ObjectImp::hasOwnProperty(exec, propertyName);
-}
-
-bool ArrayInstanceImp::hasOwnProperty(ExecState *exec, unsigned index) const
-{
-  if (index >= length)
-    return false;
-  if (index < storageLength) {
-    ValueImp *v = storage[index];
-    return v && v != UndefinedImp::staticUndefined;
-  }
-  
-  return ObjectImp::hasOwnProperty(exec, Identifier::from(index));
 }
 
@@ -429 +403 @@
 }
 
-bool ArrayPrototypeImp::getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
-{
-  return lookupGetOwnFunction<ArrayProtoFuncImp, ArrayInstanceImp>(exec, propertyName, &arrayTable, this, result);
+bool ArrayPrototypeImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
+{
+  return getStaticFunctionSlot<ArrayProtoFuncImp, ArrayInstanceImp>(exec, &arrayTable, this, propertyName, slot);
 }
 

trunk/JavaScriptCore/kjs/array_object.h

@@ -32 +32 @@
     ArrayPrototypeImp(ExecState *exec,
                       ObjectPrototypeImp *objProto);
-    bool getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const;
+    bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
     virtual const ClassInfo *classInfo() const { return &info; }
     static const ClassInfo info;

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -491 +491 @@
 }
 
-bool DatePrototypeImp::getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
-{
-  return lookupGetOwnFunction<DateProtoFuncImp, ObjectImp>(exec, propertyName, &dateTable, this, result);
+bool DatePrototypeImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
+{
+  return getStaticFunctionSlot<DateProtoFuncImp, ObjectImp>(exec, &dateTable, this, propertyName, slot);
 }
 

trunk/JavaScriptCore/kjs/date_object.h

@@ -47 +47 @@
   public:
     DatePrototypeImp(ExecState *exec, ObjectPrototypeImp *objectProto);
-    bool getOwnProperty(ExecState *exec, const Identifier& p, Value& result) const;
+    bool getOwnPropertySlot(ExecState *, const Identifier &, PropertySlot&);
     virtual const ClassInfo *classInfo() const { return &info; }
     static const ClassInfo info;

trunk/JavaScriptCore/kjs/function.cpp

@@ -209 +209 @@
 }
 
-bool FunctionImp::getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
+Value FunctionImp::argumentsGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+{
+  FunctionImp *thisObj = static_cast<FunctionImp *>(slot.slotBase());
+  ContextImp *context = exec->_context;
+  while (context) {
+    if (context->function() == thisObj) {
+      return static_cast<ActivationImp *>(context->activationObject())->get(exec, propertyName);
+    }
+    context = context->callingContext();
+  }
+  return Null();
+}
+
+Value FunctionImp::lengthGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+{
+  FunctionImp *thisObj = static_cast<FunctionImp *>(slot.slotBase());
+  const Parameter *p = thisObj->param;
+  int count = 0;
+  while (p) {
+    ++count;
+    p = p->next;
+  }
+  return Number(count);
+}
+
+bool FunctionImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
 {
     // Find the arguments from the closest context.
-    if (propertyName == argumentsPropertyName) {
-        ContextImp *context = exec->_context;
-        while (context) {
-          if (context->function() == this) {
-            result = static_cast<ActivationImp *>(context->activationObject())->get(exec, propertyName);
-            return true;
-          }
-          context = context->callingContext();
-        }
-        result = Null();
+    if (propertyName == exec->dynamicInterpreter()->argumentsIdentifier()) {
+        slot.setCustom(this, argumentsGetter);
         return true;
     }
@@ -227 +244 @@
     // Compute length of parameters.
     if (propertyName == lengthPropertyName) {
-        const Parameter * p = param;
-        int count = 0;
-        while (p) {
-            ++count;
-            p = p->next;
-        }
-        result = Number(count);
+        slot.setCustom(this, lengthGetter);
         return true;
     }
     
-    return InternalFunctionImp::getOwnProperty(exec, propertyName, result);
+    return InternalFunctionImp::getOwnPropertySlot(exec, propertyName, slot);
 }
 
 void FunctionImp::put(ExecState *exec, const Identifier &propertyName, const Value &value, int attr)
 {
-    if (propertyName == argumentsPropertyName || propertyName == lengthPropertyName)
+    if (propertyName == exec->dynamicInterpreter()->argumentsIdentifier() || propertyName == lengthPropertyName)
         return;
     InternalFunctionImp::put(exec, propertyName, value, attr);
 }
 
-bool FunctionImp::hasOwnProperty(ExecState *exec, const Identifier &propertyName) const
-{
-    if (propertyName == argumentsPropertyName || propertyName == lengthPropertyName)
-        return true;
-    return InternalFunctionImp::hasOwnProperty(exec, propertyName);
-}
-
 bool FunctionImp::deleteProperty(ExecState *exec, const Identifier &propertyName)
 {
-    if (propertyName == argumentsPropertyName || propertyName == lengthPropertyName)
+    if (propertyName == exec->dynamicInterpreter()->argumentsIdentifier() || propertyName == lengthPropertyName)
         return false;
     return InternalFunctionImp::deleteProperty(exec, propertyName);
@@ -450 +454 @@
 }
 
-bool ArgumentsImp::getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
+Value ArgumentsImp::mappedIndexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+{
+  ArgumentsImp *thisObj = static_cast<ArgumentsImp *>(slot.slotBase());
+  return thisObj->_activationObject->get(exec, thisObj->indexToNameMap[propertyName]);
+}
+
+bool ArgumentsImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
 {
   if (indexToNameMap.isMapped(propertyName)) {
-    result = _activationObject->get(exec, indexToNameMap[propertyName]);
+    slot.setCustom(this, mappedIndexGetter);
     return true;
   }
 
-  return ObjectImp::getOwnProperty(exec, propertyName, result);
+  return ObjectImp::getOwnPropertySlot(exec, propertyName, slot);
 }
 
@@ -479 +489 @@
 }
 
-bool ArgumentsImp::hasOwnProperty(ExecState *exec, const Identifier &propertyName) const
-{
-  if (indexToNameMap.isMapped(propertyName))
-    return true;
-  
-  return ObjectImp::hasOwnProperty(exec, propertyName);
-}
-
 // ------------------------------ ActivationImp --------------------------------
 
@@ -499 +501 @@
 }
 
-bool ActivationImp::getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
+Value ActivationImp::argumentsGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+{
+  ActivationImp *thisObj = static_cast<ActivationImp *>(slot.slotBase());
+
+  // default: return builtin arguments array
+  if (!thisObj->_argumentsObject)
+    thisObj->createArgumentsObject(exec);
+  
+  return Value(thisObj->_argumentsObject);
+}
+
+PropertySlot::GetValueFunc ActivationImp::getArgumentsGetter()
+{
+  return ActivationImp::argumentsGetter;
+}
+
+bool ActivationImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
 {
     // do this first so property map arguments property wins over the below
-    if (ObjectImp::getOwnProperty(exec, propertyName, result))
+    if (ObjectImp::getOwnPropertySlot(exec, propertyName, slot))
         return true;
 
-    if (propertyName == argumentsPropertyName) {
-        // default: return builtin arguments array
-        if (!_argumentsObject)
-            createArgumentsObject(exec);
-
-        result = Value(_argumentsObject);
+    if (propertyName == exec->dynamicInterpreter()->argumentsIdentifier()) {
+        slot.setCustom(this, getArgumentsGetter());
         return true;
     }
@@ -517 +531 @@
 }
 
-bool ActivationImp::hasOwnProperty(ExecState *exec, const Identifier &propertyName) const
-{
-    if (propertyName == argumentsPropertyName)
-        return true;
-    return ObjectImp::hasOwnProperty(exec, propertyName);
-}
-
 bool ActivationImp::deleteProperty(ExecState *exec, const Identifier &propertyName)
 {
-    if (propertyName == argumentsPropertyName)
+    if (propertyName == exec->dynamicInterpreter()->argumentsIdentifier())
         return false;
     return ObjectImp::deleteProperty(exec, propertyName);

trunk/JavaScriptCore/kjs/function.h

@@ -43 +43 @@
     virtual ~FunctionImp();
 
-    virtual bool getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const;
+    virtual bool getOwnPropertySlot(ExecState *, const Identifier &, PropertySlot&);
     virtual void put(ExecState *exec, const Identifier &propertyName, const Value &value, int attr = None);
-    virtual bool hasOwnProperty(ExecState *exec, const Identifier &propertyName) const;
     virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
 
@@ -67 +66 @@
 
   private:
+    static Value argumentsGetter(ExecState *, const Identifier &, const PropertySlot&);
+    static Value lengthGetter(ExecState *, const Identifier &, const PropertySlot&);
+
     void processParameters(ExecState *exec, const List &);
     virtual void processVarDecls(ExecState *exec);
@@ -110 +112 @@
     ArgumentsImp(ExecState *exec, FunctionImp *func, const List &args, ActivationImp *act);
     virtual void mark();
-    virtual bool getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const;
+    virtual bool getOwnPropertySlot(ExecState *, const Identifier &, PropertySlot&);
     virtual void put(ExecState *exec, const Identifier &propertyName,
                      const Value &value, int attr = None);
-    virtual bool hasOwnProperty(ExecState *exec, const Identifier &propertyName) const;
     virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
     virtual const ClassInfo *classInfo() const { return &info; }
     static const ClassInfo info;
   private:
+    static Value mappedIndexGetter(ExecState *exec, const Identifier &, const PropertySlot& slot);
+
     ActivationImp *_activationObject; 
     mutable IndexToNameMap indexToNameMap;
@@ -126 +129 @@
     ActivationImp(FunctionImp *function, const List &arguments);
 
-    virtual bool getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const;
-    virtual bool hasOwnProperty(ExecState *exec, const Identifier &propertyName) const;
+    virtual bool getOwnPropertySlot(ExecState *exec, const Identifier &, PropertySlot&);
     virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
 
@@ -136 +138 @@
 
   private:
+    static PropertySlot::GetValueFunc getArgumentsGetter();
+    static Value argumentsGetter(ExecState *exec, const Identifier &, const PropertySlot& slot);
     void createArgumentsObject(ExecState *exec) const;
     

trunk/JavaScriptCore/kjs/internal.cpp

@@ -498 +498 @@
 
 InterpreterImp::InterpreterImp(Interpreter *interp, const Object &glob)
-    : _context(0)
+  : globExec(interp, 0)
+  , _context(0)
 {
   // add this interpreter to the global chain
@@ -518 +519 @@
 
   global = glob;
-  globExec = new ExecState(m_interpreter,0);
   dbg = 0;
   m_compatMode = Interpreter::NativeMode;
@@ -550 +550 @@
   // Contructor prototype objects (Object.prototype, Array.prototype etc)
 
-  FunctionPrototypeImp *funcProto = new FunctionPrototypeImp(globExec);
+  FunctionPrototypeImp *funcProto = new FunctionPrototypeImp(&globExec);
   b_FunctionPrototype = Object(funcProto);
-  ObjectPrototypeImp *objProto = new ObjectPrototypeImp(globExec,funcProto);
+  ObjectPrototypeImp *objProto = new ObjectPrototypeImp(&globExec, funcProto);
   b_ObjectPrototype = Object(objProto);
   funcProto->setPrototype(b_ObjectPrototype);
 
-  ArrayPrototypeImp *arrayProto = new ArrayPrototypeImp(globExec,objProto);
+  ArrayPrototypeImp *arrayProto = new ArrayPrototypeImp(&globExec, objProto);
   b_ArrayPrototype = Object(arrayProto);
-  StringPrototypeImp *stringProto = new StringPrototypeImp(globExec,objProto);
+  StringPrototypeImp *stringProto = new StringPrototypeImp(&globExec, objProto);
   b_StringPrototype = Object(stringProto);
-  BooleanPrototypeImp *booleanProto = new BooleanPrototypeImp(globExec,objProto,funcProto);
+  BooleanPrototypeImp *booleanProto = new BooleanPrototypeImp(&globExec, objProto, funcProto);
   b_BooleanPrototype = Object(booleanProto);
-  NumberPrototypeImp *numberProto = new NumberPrototypeImp(globExec,objProto,funcProto);
+  NumberPrototypeImp *numberProto = new NumberPrototypeImp(&globExec, objProto, funcProto);
   b_NumberPrototype = Object(numberProto);
-  DatePrototypeImp *dateProto = new DatePrototypeImp(globExec,objProto);
+  DatePrototypeImp *dateProto = new DatePrototypeImp(&globExec, objProto);
   b_DatePrototype = Object(dateProto);
-  RegExpPrototypeImp *regexpProto = new RegExpPrototypeImp(globExec,objProto,funcProto);
+  RegExpPrototypeImp *regexpProto = new RegExpPrototypeImp(&globExec, objProto, funcProto);
   b_RegExpPrototype = Object(regexpProto);
-  ErrorPrototypeImp *errorProto = new ErrorPrototypeImp(globExec,objProto,funcProto);
+  ErrorPrototypeImp *errorProto = new ErrorPrototypeImp(&globExec, objProto, funcProto);
   b_ErrorPrototype = Object(errorProto);
 
@@ -574 +574 @@
 
   // Constructors (Object, Array, etc.)
-  b_Object = Object(new ObjectObjectImp(globExec, objProto, funcProto));
-  b_Function = Object(new FunctionObjectImp(globExec, funcProto));
-  b_Array = Object(new ArrayObjectImp(globExec, funcProto, arrayProto));
-  b_String = Object(new StringObjectImp(globExec, funcProto, stringProto));
-  b_Boolean = Object(new BooleanObjectImp(globExec, funcProto, booleanProto));
-  b_Number = Object(new NumberObjectImp(globExec, funcProto, numberProto));
-  b_Date = Object(new DateObjectImp(globExec, funcProto, dateProto));
-  b_RegExp = Object(new RegExpObjectImp(globExec, funcProto, regexpProto));
-  b_Error = Object(new ErrorObjectImp(globExec, funcProto, errorProto));
+  b_Object = Object(new ObjectObjectImp(&globExec, objProto, funcProto));
+  b_Function = Object(new FunctionObjectImp(&globExec, funcProto));
+  b_Array = Object(new ArrayObjectImp(&globExec, funcProto, arrayProto));
+  b_String = Object(new StringObjectImp(&globExec, funcProto, stringProto));
+  b_Boolean = Object(new BooleanObjectImp(&globExec, funcProto, booleanProto));
+  b_Number = Object(new NumberObjectImp(&globExec, funcProto, numberProto));
+  b_Date = Object(new DateObjectImp(&globExec, funcProto, dateProto));
+  b_RegExp = Object(new RegExpObjectImp(&globExec, funcProto, regexpProto));
+  b_Error = Object(new ErrorObjectImp(&globExec, funcProto, errorProto));
 
   // Error object prototypes
-  b_evalErrorPrototype = Object(new NativeErrorPrototypeImp(globExec,errorProto,EvalError,
-                                                            "EvalError","EvalError"));
-  b_rangeErrorPrototype = Object(new NativeErrorPrototypeImp(globExec,errorProto,RangeError,
-                                                            "RangeError","RangeError"));
-  b_referenceErrorPrototype = Object(new NativeErrorPrototypeImp(globExec,errorProto,ReferenceError,
-                                                            "ReferenceError","ReferenceError"));
-  b_syntaxErrorPrototype = Object(new NativeErrorPrototypeImp(globExec,errorProto,SyntaxError,
-                                                            "SyntaxError","SyntaxError"));
-  b_typeErrorPrototype = Object(new NativeErrorPrototypeImp(globExec,errorProto,TypeError,
-                                                            "TypeError","TypeError"));
-  b_uriErrorPrototype = Object(new NativeErrorPrototypeImp(globExec,errorProto,URIError,
-                                                            "URIError","URIError"));
+  b_evalErrorPrototype = Object(new NativeErrorPrototypeImp(&globExec, errorProto, EvalError,
+                                                            "EvalError", "EvalError"));
+  b_rangeErrorPrototype = Object(new NativeErrorPrototypeImp(&globExec, errorProto, RangeError,
+                                                            "RangeError", "RangeError"));
+  b_referenceErrorPrototype = Object(new NativeErrorPrototypeImp(&globExec, errorProto, ReferenceError,
+                                                            "ReferenceError", "ReferenceError"));
+  b_syntaxErrorPrototype = Object(new NativeErrorPrototypeImp(&globExec, errorProto, SyntaxError,
+                                                            "SyntaxError", "SyntaxError"));
+  b_typeErrorPrototype = Object(new NativeErrorPrototypeImp(&globExec, errorProto, TypeError,
+                                                            "TypeError", "TypeError"));
+  b_uriErrorPrototype = Object(new NativeErrorPrototypeImp(&globExec, errorProto, URIError,
+                                                            "URIError", "URIError"));
 
   // Error objects
-  b_evalError = Object(new NativeErrorImp(globExec,funcProto,b_evalErrorPrototype));
-  b_rangeError = Object(new NativeErrorImp(globExec,funcProto,b_rangeErrorPrototype));
-  b_referenceError = Object(new NativeErrorImp(globExec,funcProto,b_referenceErrorPrototype));
-  b_syntaxError = Object(new NativeErrorImp(globExec,funcProto,b_syntaxErrorPrototype));
-  b_typeError = Object(new NativeErrorImp(globExec,funcProto,b_typeErrorPrototype));
-  b_uriError = Object(new NativeErrorImp(globExec,funcProto,b_uriErrorPrototype));
+  b_evalError = Object(new NativeErrorImp(&globExec, funcProto, b_evalErrorPrototype));
+  b_rangeError = Object(new NativeErrorImp(&globExec, funcProto, b_rangeErrorPrototype));
+  b_referenceError = Object(new NativeErrorImp(&globExec, funcProto, b_referenceErrorPrototype));
+  b_syntaxError = Object(new NativeErrorImp(&globExec, funcProto, b_syntaxErrorPrototype));
+  b_typeError = Object(new NativeErrorImp(&globExec, funcProto, b_typeErrorPrototype));
+  b_uriError = Object(new NativeErrorImp(&globExec, funcProto, b_uriErrorPrototype));
 
   // ECMA 15.3.4.1
-  funcProto->put(globExec,"constructor", b_Function, DontEnum);
-
-  global.put(globExec,"Object", b_Object, DontEnum);
-  global.put(globExec,"Function", b_Function, DontEnum);
-  global.put(globExec,"Array", b_Array, DontEnum);
-  global.put(globExec,"Boolean", b_Boolean, DontEnum);
-  global.put(globExec,"String", b_String, DontEnum);
-  global.put(globExec,"Number", b_Number, DontEnum);
-  global.put(globExec,"Date", b_Date, DontEnum);
-  global.put(globExec,"RegExp", b_RegExp, DontEnum);
-  global.put(globExec,"Error", b_Error, DontEnum);
+  funcProto->put(&globExec, "constructor", b_Function, DontEnum);
+
+  global.put(&globExec, "Object", b_Object, DontEnum);
+  global.put(&globExec, "Function", b_Function, DontEnum);
+  global.put(&globExec, "Array", b_Array, DontEnum);
+  global.put(&globExec, "Boolean", b_Boolean, DontEnum);
+  global.put(&globExec, "String", b_String, DontEnum);
+  global.put(&globExec, "Number", b_Number, DontEnum);
+  global.put(&globExec, "Date", b_Date, DontEnum);
+  global.put(&globExec, "RegExp", b_RegExp, DontEnum);
+  global.put(&globExec, "Error", b_Error, DontEnum);
   // Using Internal for those to have something != 0
   // (see kjs_window). Maybe DontEnum would be ok too ?
-  global.put(globExec,"EvalError",b_evalError, Internal);
-  global.put(globExec,"RangeError",b_rangeError, Internal);
-  global.put(globExec,"ReferenceError",b_referenceError, Internal);
-  global.put(globExec,"SyntaxError",b_syntaxError, Internal);
-  global.put(globExec,"TypeError",b_typeError, Internal);
-  global.put(globExec,"URIError",b_uriError, Internal);
+  global.put(&globExec, "EvalError",b_evalError, Internal);
+  global.put(&globExec, "RangeError",b_rangeError, Internal);
+  global.put(&globExec, "ReferenceError",b_referenceError, Internal);
+  global.put(&globExec, "SyntaxError",b_syntaxError, Internal);
+  global.put(&globExec, "TypeError",b_typeError, Internal);
+  global.put(&globExec, "URIError",b_uriError, Internal);
 
   // Set the "constructor" property of all builtin constructors
-  objProto->put(globExec, "constructor", b_Object, DontEnum | DontDelete | ReadOnly);
-  funcProto->put(globExec, "constructor", b_Function, DontEnum | DontDelete | ReadOnly);
-  arrayProto->put(globExec, "constructor", b_Array, DontEnum | DontDelete | ReadOnly);
-  booleanProto->put(globExec, "constructor", b_Boolean, DontEnum | DontDelete | ReadOnly);
-  stringProto->put(globExec, "constructor", b_String, DontEnum | DontDelete | ReadOnly);
-  numberProto->put(globExec, "constructor", b_Number, DontEnum | DontDelete | ReadOnly);
-  dateProto->put(globExec, "constructor", b_Date, DontEnum | DontDelete | ReadOnly);
-  regexpProto->put(globExec, "constructor", b_RegExp, DontEnum | DontDelete | ReadOnly);
-  errorProto->put(globExec, "constructor", b_Error, DontEnum | DontDelete | ReadOnly);
-  b_evalErrorPrototype.put(globExec, "constructor", b_evalError, DontEnum | DontDelete | ReadOnly);
-  b_rangeErrorPrototype.put(globExec, "constructor", b_rangeError, DontEnum | DontDelete | ReadOnly);
-  b_referenceErrorPrototype.put(globExec, "constructor", b_referenceError, DontEnum | DontDelete | ReadOnly);
-  b_syntaxErrorPrototype.put(globExec, "constructor", b_syntaxError, DontEnum | DontDelete | ReadOnly);
-  b_typeErrorPrototype.put(globExec, "constructor", b_typeError, DontEnum | DontDelete | ReadOnly);
-  b_uriErrorPrototype.put(globExec, "constructor", b_uriError, DontEnum | DontDelete | ReadOnly);
+  objProto->put(&globExec, "constructor", b_Object, DontEnum | DontDelete | ReadOnly);
+  funcProto->put(&globExec, "constructor", b_Function, DontEnum | DontDelete | ReadOnly);
+  arrayProto->put(&globExec, "constructor", b_Array, DontEnum | DontDelete | ReadOnly);
+  booleanProto->put(&globExec, "constructor", b_Boolean, DontEnum | DontDelete | ReadOnly);
+  stringProto->put(&globExec, "constructor", b_String, DontEnum | DontDelete | ReadOnly);
+  numberProto->put(&globExec, "constructor", b_Number, DontEnum | DontDelete | ReadOnly);
+  dateProto->put(&globExec, "constructor", b_Date, DontEnum | DontDelete | ReadOnly);
+  regexpProto->put(&globExec, "constructor", b_RegExp, DontEnum | DontDelete | ReadOnly);
+  errorProto->put(&globExec, "constructor", b_Error, DontEnum | DontDelete | ReadOnly);
+  b_evalErrorPrototype.put(&globExec, "constructor", b_evalError, DontEnum | DontDelete | ReadOnly);
+  b_rangeErrorPrototype.put(&globExec, "constructor", b_rangeError, DontEnum | DontDelete | ReadOnly);
+  b_referenceErrorPrototype.put(&globExec, "constructor", b_referenceError, DontEnum | DontDelete | ReadOnly);
+  b_syntaxErrorPrototype.put(&globExec, "constructor", b_syntaxError, DontEnum | DontDelete | ReadOnly);
+  b_typeErrorPrototype.put(&globExec, "constructor", b_typeError, DontEnum | DontDelete | ReadOnly);
+  b_uriErrorPrototype.put(&globExec, "constructor", b_uriError, DontEnum | DontDelete | ReadOnly);
 
   // built-in values
-  global.put(globExec, "NaN",        Number(NaN), DontEnum|DontDelete);
-  global.put(globExec, "Infinity",   Number(Inf), DontEnum|DontDelete);
-  global.put(globExec, "undefined",  Undefined(), DontEnum|DontDelete);
+  global.put(&globExec, "NaN",        Number(NaN), DontEnum|DontDelete);
+  global.put(&globExec, "Infinity",   Number(Inf), DontEnum|DontDelete);
+  global.put(&globExec, "undefined",  Undefined(), DontEnum|DontDelete);
 
   // built-in functions
-  global.put(globExec,"eval",       Object(new GlobalFuncImp(globExec,funcProto,GlobalFuncImp::Eval,       1)), DontEnum);
-  global.put(globExec,"parseInt",   Object(new GlobalFuncImp(globExec,funcProto,GlobalFuncImp::ParseInt,   2)), DontEnum);
-  global.put(globExec,"parseFloat", Object(new GlobalFuncImp(globExec,funcProto,GlobalFuncImp::ParseFloat, 1)), DontEnum);
-  global.put(globExec,"isNaN",      Object(new GlobalFuncImp(globExec,funcProto,GlobalFuncImp::IsNaN,      1)), DontEnum);
-  global.put(globExec,"isFinite",   Object(new GlobalFuncImp(globExec,funcProto,GlobalFuncImp::IsFinite,   1)), DontEnum);
-  global.put(globExec,"escape",     Object(new GlobalFuncImp(globExec,funcProto,GlobalFuncImp::Escape,     1)), DontEnum);
-  global.put(globExec,"unescape",   Object(new GlobalFuncImp(globExec,funcProto,GlobalFuncImp::UnEscape,   1)), DontEnum);
-  global.put(globExec,"decodeURI",  Object(new GlobalFuncImp(globExec,funcProto,GlobalFuncImp::DecodeURI,  1)), DontEnum);
-  global.put(globExec,"decodeURIComponent", Object(new GlobalFuncImp(globExec,funcProto,GlobalFuncImp::DecodeURIComponent, 1)), DontEnum);
-  global.put(globExec,"encodeURI",  Object(new GlobalFuncImp(globExec,funcProto,GlobalFuncImp::EncodeURI,  1)), DontEnum);
-  global.put(globExec,"encodeURIComponent", Object(new GlobalFuncImp(globExec,funcProto,GlobalFuncImp::EncodeURIComponent, 1)), DontEnum);
+  global.put(&globExec, "eval",       Object(new GlobalFuncImp(&globExec, funcProto, GlobalFuncImp::Eval, 1)), DontEnum);
+  global.put(&globExec, "parseInt",   Object(new GlobalFuncImp(&globExec, funcProto, GlobalFuncImp::ParseInt, 2)), DontEnum);
+  global.put(&globExec, "parseFloat", Object(new GlobalFuncImp(&globExec, funcProto, GlobalFuncImp::ParseFloat, 1)), DontEnum);
+  global.put(&globExec, "isNaN",      Object(new GlobalFuncImp(&globExec, funcProto, GlobalFuncImp::IsNaN, 1)), DontEnum);
+  global.put(&globExec, "isFinite",   Object(new GlobalFuncImp(&globExec, funcProto, GlobalFuncImp::IsFinite, 1)), DontEnum);
+  global.put(&globExec, "escape",     Object(new GlobalFuncImp(&globExec, funcProto, GlobalFuncImp::Escape, 1)), DontEnum);
+  global.put(&globExec, "unescape",   Object(new GlobalFuncImp(&globExec, funcProto, GlobalFuncImp::UnEscape, 1)), DontEnum);
+  global.put(&globExec, "decodeURI",  Object(new GlobalFuncImp(&globExec, funcProto, GlobalFuncImp::DecodeURI, 1)), DontEnum);
+  global.put(&globExec, "decodeURIComponent", Object(new GlobalFuncImp(&globExec, funcProto, GlobalFuncImp::DecodeURIComponent, 1)), DontEnum);
+  global.put(&globExec, "encodeURI",  Object(new GlobalFuncImp(&globExec, funcProto, GlobalFuncImp::EncodeURI, 1)), DontEnum);
+  global.put(&globExec, "encodeURIComponent", Object(new GlobalFuncImp(&globExec, funcProto, GlobalFuncImp::EncodeURIComponent, 1)), DontEnum);
 #ifndef NDEBUG
-  global.put(globExec,"kjsprint",   Object(new GlobalFuncImp(globExec,funcProto,GlobalFuncImp::KJSPrint,   1)), DontEnum);
+  global.put(&globExec, "kjsprint",   Object(new GlobalFuncImp(&globExec, funcProto, GlobalFuncImp::KJSPrint, 1)), DontEnum);
 #endif
 
   // built-in objects
-  global.put(globExec,"Math", Object(new MathObjectImp(globExec,objProto)), DontEnum);
+  global.put(&globExec, "Math", Object(new MathObjectImp(&globExec, objProto)), DontEnum);
 }
 
@@ -673 +673 @@
   if (dbg)
     dbg->detach(m_interpreter);
-  delete globExec;
-  globExec = 0L;
   clear();
 }
@@ -746 +744 @@
   if (recursion >= 20) {
 #if APPLE_CHANGES
-    Completion result = Completion(Throw,Error::create(globExec,GeneralError,"Recursion too deep"));
+    Completion result = Completion(Throw, Error::create(&globExec, GeneralError, "Recursion too deep"));
     unlockInterpreter();
     return result;
 #else
-    return Completion(Throw,Error::create(globExec,GeneralError,"Recursion too deep"));
+    return Completion(Throw,Error::create(&globExec, GeneralError, "Recursion too deep"));
 #endif
   }
@@ -762 +760 @@
   // notify debugger that source has been parsed
   if (dbg) {
-    bool cont = dbg->sourceParsed(globExec,sid,sourceURL,code,errLine);
+    bool cont = dbg->sourceParsed(&globExec, sid, sourceURL, code, errLine);
     if (!cont)
 #if APPLE_CHANGES
@@ -776 +774 @@
   // no program node means a syntax error occurred
   if (!progNode) {
-    Object err = Error::create(globExec,SyntaxError,errMsg.ascii(),errLine, -1, &sourceURL);
-    err.put(globExec,"sid",Number(sid));
+    Object err = Error::create(&globExec, SyntaxError, errMsg.ascii(), errLine, -1, &sourceURL);
+    err.put(&globExec, "sid", Number(sid));
 #if APPLE_CHANGES
     unlockInterpreter();
@@ -784 +782 @@
   }
 
-  globExec->clearException();
+  globExec.clearException();
 
   recursion++;
@@ -797 +795 @@
       thisObj = globalObject();
     else {
-      thisObj = thisV.toObject(globExec);
+      thisObj = thisV.toObject(&globExec);
     }
   }
 
   Completion res;
-  if (globExec->hadException()) {
+  if (globExec.hadException()) {
     // the thisArg.toObject() conversion above might have thrown an exception - if so,
     // propagate it back
-    res = Completion(Throw,globExec->exception());
+    res = Completion(Throw, globExec.exception());
   }
   else {

trunk/JavaScriptCore/kjs/internal.h

@@ -29 +29 @@
 #include "value.h"
 #include "object.h"
+#include "protected_object.h"
 #include "types.h"
 #include "interpreter.h"
@@ -288 +289 @@
     void mark();
 
-    ExecState *globalExec() { return globExec; }
+    ExecState *globalExec() { return &globExec; }
     bool checkSyntax(const UString &code);
     Completion evaluate(const UString &code, const Value &thisV, const UString &sourceURL, int startingLineNumber);
@@ -388 +389 @@
     ProtectedObject b_uriErrorPrototype;
 
-    ExecState *globExec;
+    ExecState globExec;
     Interpreter::CompatMode m_compatMode;
 

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -27 +27 @@
 #include "types.h"
 #include "interpreter.h"
+#if APPLE_CHANGES
+#include "runtime.h"
+#endif
 
 #include <assert.h>
@@ -65 +68 @@
 // ------------------------------ Interpreter ----------------------------------
 
-Interpreter::Interpreter(const Object &global) : rep(0)
+Interpreter::Interpreter(const Object &global) 
+  : rep(0)
+  , m_argumentsPropertyName(&argumentsPropertyName)
+  , m_specialPrototypePropertyName(&specialPrototypePropertyName)
 {
   rep = new InterpreterImp(this,global);
@@ -71 +77 @@
 
 Interpreter::Interpreter()
+  : rep(0)
+  , m_argumentsPropertyName(&argumentsPropertyName)
+  , m_specialPrototypePropertyName(&specialPrototypePropertyName)
 {
   Object global(new ObjectImp());
@@ -329 +338 @@
 
 
-void *Interpreter::createLanguageInstanceForValue (ExecState *exec, Bindings::Instance::BindingLanguage language, const Object &value, const Bindings::RootObject *origin, const Bindings::RootObject *current)
-{
-    return Bindings::Instance::createLanguageInstanceForValue (exec, language, value, origin, current);
+void *Interpreter::createLanguageInstanceForValue (ExecState *exec, int language, const Object &value, const Bindings::RootObject *origin, const Bindings::RootObject *current)
+{
+    return Bindings::Instance::createLanguageInstanceForValue (exec, (Bindings::Instance::BindingLanguage)language, value, origin, current);
 }
 

trunk/JavaScriptCore/kjs/interpreter.h

@@ -26 +26 @@
 #define _KJS_INTERPRETER_H_
 
+#include "object_wrapper.h"
 #include "value.h"
-#include "object.h"
 #include "types.h"
-#include "protect.h"
-
-#if APPLE_CHANGES
-
-#include "runtime.h"
-
-#endif
 
 namespace KJS {
@@ -41 +34 @@
   class ContextImp;
   class InterpreterImp;
+  class RuntimeMethodImp;
+
+  namespace Bindings {
+    class RootObject;
+  }
 
   /**
@@ -402 +400 @@
     virtual bool isSafeScript (const Interpreter *target) { return true; }
     
-    virtual void *createLanguageInstanceForValue (ExecState *exec, Bindings::Instance::BindingLanguage language, const Object &value, const Bindings::RootObject *origin, const Bindings::RootObject *current);
+    virtual void *createLanguageInstanceForValue (ExecState *exec, int language, const Object &value, const Bindings::RootObject *origin, const Bindings::RootObject *current);
 #endif
+
+    // This is a workaround to avoid accessing the global variables for these identifiers in
+    // important property lookup functions, to avoid taking PIC branches in Mach-O binaries
+    const Identifier& argumentsIdentifier() { return *m_argumentsPropertyName; }
+    const Identifier& specialPrototypeIdentifier() { return *m_specialPrototypePropertyName; }
     
   private:
     InterpreterImp *rep;
 
+    const Identifier *m_argumentsPropertyName;
+    const Identifier *m_specialPrototypePropertyName;
+
     /**
      * This constructor is not implemented, in order to prevent
@@ -421 +427 @@
      */
     Interpreter operator=(const Interpreter&);
+
   protected:
     virtual void virtual_hook( int id, void* data );
@@ -474 +481 @@
     Interpreter *_interpreter;
     ContextImp *_context;
-    ProtectedValue _exception;
+    Value _exception;
   };
 

trunk/JavaScriptCore/kjs/lookup.h

@@ -125 +125 @@
   /**
    * @internal
-   * Helper for lookupFunction and lookupValueOrFunction
+   * Helper for getStaticFunctionSlot and getStaticPropertySlot
    */
   template <class FuncImp>
-  inline Value lookupOrCreateFunction(ExecState *exec, const Identifier &propertyName,
-                                      const ObjectImp *thisObj, int token, int params, int attr)
+  inline Value staticFunctionGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
   {
       // Look for cached value in dynamic map of properties (in ObjectImp)
-      ValueImp * cachedVal = thisObj->ObjectImp::getDirect(propertyName);
-      /*if (cachedVal)
-        fprintf(stderr, "lookupOrCreateFunction: Function -> looked up in ObjectImp, found type=%d\n", cachedVal->type());*/
+      ObjectImp *thisObj = slot.slotBase();
+      ValueImp *cachedVal = thisObj->getDirect(propertyName);
       if (cachedVal)
-        return Value(cachedVal);
-
-      Value val = Value(new FuncImp(exec,token, params));
-      ObjectImp *thatObj = const_cast<ObjectImp *>(thisObj);
-      thatObj->ObjectImp::put(exec, propertyName, val, attr);
+          return Value(cachedVal);
+
+      const HashEntry *entry = slot.staticEntry();
+      Value val = Value(new FuncImp(exec, entry->value, entry->params));
+      thisObj->putDirect(propertyName, val.imp(), entry->attr);
       return val;
+  }
+
+  /**
+   * @internal
+   * Helper for getStaticValueSlot and getStaticPropertySlot
+   */
+  template <class ThisImp>
+  inline Value staticValueGetter(ExecState *exec, const Identifier&, const PropertySlot& slot)
+  {
+      ThisImp *thisObj = static_cast<ThisImp *>(slot.slotBase());
+      const HashEntry *entry = slot.staticEntry();
+      return thisObj->getValueProperty(exec, entry->value);
   }
 
@@ -165 +175 @@
    */
   template <class FuncImp, class ThisImp, class ParentImp>
-  inline bool lookupGetOwnProperty(ExecState *exec, const Identifier &propertyName,
-                                   const HashTable* table, const ThisImp* thisObj, Value& result)
+  inline bool getStaticPropertySlot(ExecState *exec, const HashTable* table, 
+                                    ThisImp* thisObj, const Identifier& propertyName, PropertySlot& slot)
   {
     const HashEntry* entry = Lookup::findEntry(table, propertyName);
 
     if (!entry) // not found, forward to parent
-      return thisObj->ParentImp::getOwnProperty(exec, propertyName, result);
+      return thisObj->ParentImp::getOwnPropertySlot(exec, propertyName, slot);
 
     if (entry->attr & Function)
-      result = lookupOrCreateFunction<FuncImp>(exec, propertyName, thisObj, entry->value, entry->params, entry->attr);
+      slot.setStaticEntry(thisObj, entry, staticFunctionGetter<FuncImp>);
     else 
-      result = thisObj->getValueProperty(exec, entry->value);
+      slot.setStaticEntry(thisObj, entry, staticValueGetter<ThisImp>);
 
     return true;
@@ -182 +192 @@
 
   /**
-   * Simplified version of lookupGet in case there are only functions.
-   * Using this instead of lookupGet prevents 'this' from implementing a dummy getValueProperty.
+   * Simplified version of getStaticPropertySlot in case there are only functions.
+   * Using this instead of getStaticPropertySlot allows 'this' to avoid implementing 
+   * a dummy getValueProperty.
    */
   template <class FuncImp, class ParentImp>
-  inline bool lookupGetOwnFunction(ExecState *exec, const Identifier &propertyName,
-                                   const HashTable* table, const ObjectImp* thisObj, Value& result)
+  inline bool getStaticFunctionSlot(ExecState *exec, const HashTable *table, 
+                                    ObjectImp* thisObj, const Identifier& propertyName, PropertySlot& slot)
   {
     const HashEntry* entry = Lookup::findEntry(table, propertyName);
 
     if (!entry) // not found, forward to parent
-      return static_cast<const ParentImp *>(thisObj)->ParentImp::getOwnProperty(exec, propertyName, result);
+      return static_cast<ParentImp *>(thisObj)->ParentImp::getOwnPropertySlot(exec, propertyName, slot);
 
     assert(entry->attr & Function);
 
-    result = lookupOrCreateFunction<FuncImp>(exec, propertyName, thisObj, entry->value, entry->params, entry->attr);
+    slot.setStaticEntry(thisObj, entry, staticFunctionGetter<FuncImp>);
     return true;
   }
 
   /**
-   * Simplified version of lookupGet in case there are no functions, only "values".
-   * Using this instead of lookupGet removes the need for a FuncImp class.
+   * Simplified version of getStaticPropertySlot in case there are no functions, only "values".
+   * Using this instead of getStaticPropertySlot removes the need for a FuncImp class.
    */
   template <class ThisImp, class ParentImp>
-  inline bool lookupGetOwnValue(ExecState *exec, const Identifier &propertyName,
-                                const HashTable* table, const ThisImp* thisObj, Value& result)
+  inline bool getStaticValueSlot(ExecState *exec, const HashTable* table, 
+                                 ThisImp* thisObj, const Identifier &propertyName, PropertySlot& slot)
   {
     const HashEntry* entry = Lookup::findEntry(table, propertyName);
 
     if (!entry) // not found, forward to parent
-      return thisObj->ParentImp::getOwnProperty(exec, propertyName, result);
+      return thisObj->ParentImp::getOwnPropertySlot(exec, propertyName, slot);
 
     assert(!(entry->attr & Function));
 
-    result = thisObj->getValueProperty(exec, entry->value);
+    slot.setStaticEntry(thisObj, entry, staticValueGetter<ThisImp>);
     return true;
   }
@@ -296 +307 @@
     virtual const ClassInfo *classInfo() const { return &info; } \
     static const ClassInfo info; \
-    bool getOwnProperty(ExecState *exec, const Identifier &propertyName, Value& result) const; \
-    bool hasOwnProperty(ExecState *exec, const Identifier &propertyName) const; \
+    bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&); \
   }; \
   const ClassInfo ClassProto::info = { ClassName, 0, &ClassProto##Table, 0 };
 
 #define IMPLEMENT_PROTOTYPE(ClassProto,ClassFunc) \
-    bool ClassProto::getOwnProperty(ExecState *exec, const Identifier &propertyName, Value& result) const \
+    bool ClassProto::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot) \
     { \
-      return lookupGetOwnFunction<ClassFunc,ObjectImp>(exec, propertyName, &ClassProto##Table, this, result); \
-    } \
-    bool ClassProto::hasOwnProperty(ExecState *exec, const Identifier &propertyName) const \
-    { /*stupid but we need this to have a common macro for the declaration*/ \
-      return ObjectImp::hasOwnProperty(exec, propertyName); \
+      return getStaticFunctionSlot<ClassFunc,ObjectImp>(exec, &ClassProto##Table, this, propertyName, slot); \
     }
 
 #define IMPLEMENT_PROTOTYPE_WITH_PARENT(ClassProto,ClassFunc,ParentProto)  \
-    bool ClassProto::getOwnProperty(ExecState *exec, const Identifier &propertyName, Value& result) const \
+    bool ClassProto::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot) \
     { \
-      if (lookupGetOwnFunction<ClassFunc,ObjectImp>(exec, propertyName, &ClassProto##Table, this, result)) \
+      if (getStaticFunctionSlot<ClassFunc,ObjectImp>(exec, &ClassProto##Table, this, propertyName, slot)) \
           return true; \
-      return ParentProto::self(exec)->getOwnProperty(exec, propertyName, result); \
-    } \
-    bool ClassProto::hasOwnProperty(ExecState *exec, const Identifier &propertyName) const \
-    { \
-      if (ObjectImp::hasOwnProperty(exec, propertyName)) \
-        return true; \
-      return ParentProto::self(exec)->hasOwnProperty(exec, propertyName); \
+      return ParentProto::self(exec)->getOwnPropertySlot(exec, propertyName, slot); \
     }
 

trunk/JavaScriptCore/kjs/math_object.cpp

@@ -82 +82 @@
 // ECMA 15.8
 
-bool MathObjectImp::getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
-{
-  return lookupGetOwnProperty<MathFuncImp, MathObjectImp, ObjectImp>(exec, propertyName, &mathTable, this, result);
+bool MathObjectImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot &slot)
+{
+  return getStaticPropertySlot<MathFuncImp, MathObjectImp, ObjectImp>(exec, &mathTable, this, propertyName, slot);
 }
 

trunk/JavaScriptCore/kjs/math_object.h

@@ -32 +32 @@
     MathObjectImp(ExecState *exec,
                   ObjectPrototypeImp *objProto);
-    bool getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const;
+    bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
     Value getValueProperty(ExecState *exec, int token) const;
     virtual const ClassInfo *classInfo() const { return &info; }

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -278 +278 @@
   ScopeChain chain = exec->context().imp()->scopeChain();
 
-  Value result;
-  while (!chain.isEmpty()) {
+  assert(!chain.isEmpty());
+
+  PropertySlot slot;
+  do { 
     ObjectImp *o = chain.top();
-
-    if (o->getProperty(exec, ident, result))
-      return result;
+    if (o->getPropertySlot(exec, ident, slot))
+      return slot.getValue(exec, ident);
     
     chain.pop();
-  }
-
-  UString m = I18N_NOOP("Can't find variable: ") + ident.ustring();
-  Object err = Error::create(exec, ReferenceError, m.ascii());
-  exec->setException(err);
-  return err;
+  } while (!chain.isEmpty());
+
+  return Reference(Null(), ident).getValue(exec);
 }
 
@@ -298 +296 @@
   ScopeChain chain = exec->context().imp()->scopeChain();
 
-  while (!chain.isEmpty()) {
+  assert(!chain.isEmpty());
+
+  PropertySlot slot;
+  do { 
     ObjectImp *o = chain.top();
-
-    //cout << "Resolve: looking at '" << ident.ascii() << "'"
-    //     << " in " << (void*)o << " " << o->classInfo()->className << endl;
-    if (o->hasProperty(exec,ident)) {
-      //cout << "Resolve: FOUND '" << ident.ascii() << "'"
-      //     << " in " << (void*)o << " " << o->classInfo()->className << endl;
+    if (o->getPropertySlot(exec, ident, slot))
       return Reference(o, ident);
-    }
     
     chain.pop();
-  }
-
-  // identifier not found
-  //cout << "Resolve: didn't find '" << ident.ascii() << "'" << endl;
+  } while (!chain.isEmpty());
+
   return Reference(Null(), ident);
 }
@@ -530 +523 @@
 Value AccessorNode1::evaluate(ExecState *exec)
 {
-  return evaluateReference(exec).getValue(exec);
+  Value v1 = expr1->evaluate(exec);
+  KJS_CHECKEXCEPTIONVALUE
+  Value v2 = expr2->evaluate(exec);
+  KJS_CHECKEXCEPTIONVALUE
+  Object o = v1.toObject(exec);
+  unsigned i;
+  if (v2.toUInt32(i))
+    return o.get(exec, i);
+
+  String s = v2.toString(exec);
+  return o.get(exec, Identifier(s.value()));
 }
 
@@ -567 +570 @@
 Value AccessorNode2::evaluate(ExecState *exec)
 {
-  return evaluateReference(exec).getValue(exec);
+  Value v = expr->evaluate(exec);
+  KJS_CHECKEXCEPTIONVALUE
+  Object o = v.toObject(exec);
+  return o.get(exec, ident);
+
 }
 

trunk/JavaScriptCore/kjs/number_object.cpp

@@ -403 +403 @@
 }
 
-bool NumberObjectImp::getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
-{
-  return lookupGetOwnValue<NumberObjectImp, InternalFunctionImp>(exec, propertyName, &numberTable, this, result);
+bool NumberObjectImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
+{
+  return getStaticValueSlot<NumberObjectImp, InternalFunctionImp>(exec, &numberTable, this, propertyName, slot);
 }
 

trunk/JavaScriptCore/kjs/number_object.h

@@ -85 +85 @@
     virtual Value call(ExecState *exec, Object &thisObj, const List &args);
 
-    bool getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const;
+    bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
     Value getValueProperty(ExecState *exec, int token) const;
     virtual const ClassInfo *classInfo() const { return &info; }

trunk/JavaScriptCore/kjs/object.cpp

@@ -209 +209 @@
 Value ObjectImp::get(ExecState *exec, const Identifier &propertyName) const
 {
-  Value result;
-
-  const ObjectImp *imp = this;
-
+  PropertySlot slot;
+
+  if (const_cast<ObjectImp *>(this)->getPropertySlot(exec, propertyName, slot))
+    return slot.getValue(exec, propertyName);
+    
+  return Undefined();
+}
+
+Value ObjectImp::get(ExecState *exec, unsigned propertyName) const
+{
+  PropertySlot slot;
+  if (const_cast<ObjectImp *>(this)->getPropertySlot(exec, propertyName, slot))
+    return slot.getValue(exec, propertyName);
+    
+  return Undefined();
+}
+
+bool ObjectImp::getProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
+{
+  PropertySlot slot;
+  if (const_cast<ObjectImp *>(this)->getPropertySlot(exec, propertyName, slot)) {
+    result = slot.getValue(exec, propertyName);
+    return true;
+  }
+  
+  return false;
+}
+
+bool ObjectImp::getProperty(ExecState *exec, unsigned propertyName, Value& result) const
+{
+  PropertySlot slot;
+  if (const_cast<ObjectImp *>(this)->getPropertySlot(exec, propertyName, slot)) {
+    result = slot.getValue(exec, propertyName);
+    return true;
+  }
+    
+  return false;
+}
+
+bool ObjectImp::getPropertySlot(ExecState *exec, unsigned propertyName, PropertySlot& slot)
+{
+  ObjectImp *imp = this;
+  
   while (true) {
-    if (imp->getOwnProperty(exec, propertyName, result))
-      return result;
-
-    const ValueImp *proto = imp->_proto;
+    if (imp->getOwnPropertySlot(exec, propertyName, slot))
+      return true;
+    
+    ValueImp *proto = imp->_proto;
     if (proto->dispatchType() != ObjectType)
       break;
-
-    imp = static_cast<const ObjectImp *>(proto);
-  }
-
-  return Undefined();
-}
-
-bool ObjectImp::getOwnProperty(ExecState *exec, unsigned propertyName, Value& result) const
-{
-  return getOwnProperty(exec, Identifier::from(propertyName), result);
-}
-
-Value ObjectImp::get(ExecState *exec, unsigned propertyName) const
-{
-  Value result;
-
-  const ObjectImp *imp = this;
-
-  while (imp) {
-    if (imp->getOwnProperty(exec, propertyName, result))
-      return result;
-
-    const ValueImp *proto = imp->_proto;
-    if (proto->dispatchType() != ObjectType)
-      break;
-
-    imp = static_cast<const ObjectImp *>(proto);
-  }
-
-  return Undefined();
-}
-
-bool ObjectImp::getProperty(ExecState *exec, unsigned propertyName, Value& result) const
-{
-  const ObjectImp *imp = this;
-  
-  while (true) {
-    if (imp->getOwnProperty(exec, propertyName, result))
-      return true;
     
-    const ValueImp *proto = imp->_proto;
-      if (proto->dispatchType() != ObjectType)
-        break;
-      
-      imp = static_cast<const ObjectImp *>(proto);
+    imp = static_cast<ObjectImp *>(proto);
   }
   
   return false;
+}
+
+bool ObjectImp::getOwnPropertySlot(ExecState *exec, unsigned propertyName, PropertySlot& slot)
+{
+  return getOwnPropertySlot(exec, Identifier::from(propertyName), slot);
 }
 
@@ -277 +278 @@
 
   // non-standard netscape extension
-  if (propertyName == specialPrototypePropertyName) {
+  if (propertyName == exec->dynamicInterpreter()->specialPrototypeIdentifier()) {
     setPrototype(value);
     return;
@@ -324 +325 @@
 bool ObjectImp::hasProperty(ExecState *exec, const Identifier &propertyName) const
 {
-  if (hasOwnProperty(exec, propertyName))
-    return true;
-
-  if (!_proto || _proto->dispatchType() != ObjectType) {
-    return false;
-  }
-
-  // Look in the prototype
-  return static_cast<ObjectImp *>(_proto)->hasProperty(exec, propertyName);
+  PropertySlot slot;
+  return const_cast<ObjectImp *>(this)->getPropertySlot(exec, propertyName, slot);
 }
 
 bool ObjectImp::hasProperty(ExecState *exec, unsigned propertyName) const
 {
-    if (hasOwnProperty(exec, propertyName))
-      return true;
-
-    if (!_proto || _proto->dispatchType() != ObjectType) {
-      return false;
-    }
-
-    // Look in the prototype
-    return static_cast<ObjectImp *>(_proto)->hasProperty(exec, propertyName);
+  PropertySlot slot;
+  return const_cast<ObjectImp *>(this)->getPropertySlot(exec, propertyName, slot);
 }
 
 bool ObjectImp::hasOwnProperty(ExecState *exec, const Identifier &propertyName) const
 {
-  if (_prop.get(propertyName))
-    return true;
-
-  // Look in the static hashtable of properties
-  if (findPropertyHashEntry(propertyName))
-    return true;
-
-  // non-standard netscape extension
-  if (propertyName == specialPrototypePropertyName)
-    return true;
-
-  return false;
-}
-
-bool ObjectImp::hasOwnProperty(ExecState *exec, unsigned propertyName) const
-{
-  return hasOwnProperty(exec, Identifier::from(propertyName));
-}
-
+  PropertySlot slot;
+  return const_cast<ObjectImp *>(this)->getOwnPropertySlot(exec, propertyName, slot);
+}
 
 // ECMA 8.6.2.5

trunk/JavaScriptCore/kjs/object.h

@@ -39 +39 @@
 #endif
 
-#include "value.h"
 #include "types.h"
+#include "interpreter.h"
 #include "reference_list.h"
 #include "property_map.h"
+#include "property_slot.h"
 #include "scope_chain.h"
 
@@ -50 +51 @@
   class HashEntry;
   class ListImp;
-  class ReferenceList;
-
-  // ECMA 262-3 8.6.1
-  // Attributes (only applicable to the Object type)
-  enum Attribute { None       = 0,
-                   ReadOnly   = 1 << 1, // property can be only read, not written
-                   DontEnum   = 1 << 2, // property doesn't appear in (for .. in ..)
-                   DontDelete = 1 << 3, // property can't be deleted
-                   Internal   = 1 << 4, // an internal property, set to by pass checks
-                   Function   = 1 << 5 }; // property is a function - only used by static hashtables
 
   /**
@@ -84 +75 @@
   };
   
-  /**
-   * Represents an Object. This is a wrapper for ObjectImp
-   */
-  class Object : public Value {
-  public:
-    Object() { }
-    Object(ObjectImp *);
-    operator ObjectImp *() const { return imp(); }
-    
-    ObjectImp *imp() const;
-
-    const ClassInfo *classInfo() const;
-    bool inherits(const ClassInfo *cinfo) const;
-
-    /**
-     * Converts a Value into an Object. If the value's type is not ObjectType,
-     * a null object will be returned (i.e. one with it's internal pointer set
-     * to 0). If you do not know for sure whether the value is of type
-     * ObjectType, you should check the isValid() methods afterwards before
-     * calling any methods on the Object.
-     *
-     * @return The value converted to an object
-     */
-    static Object dynamicCast(const Value &v);
-
-    /**
-     * Returns the prototype of this object. Note that this is not the same as
-     * the "prototype" property.
-     *
-     * See ECMA 8.6.2
-     *
-     * @return The object's prototype
-     */
-    Value prototype() const;
-
-    /**
-     * Returns the class name of the object
-     *
-     * See ECMA 8.6.2
-     *
-     * @return The object's class name
-     */
-    UString className() const;
-
-    /**
-     * Retrieves the specified property from the object. If neither the object
-     * or any other object in it's prototype chain have the property, this
-     * function will return Undefined.
-     *
-     * See ECMA 8.6.2.1
-     *
-     * @param exec The current execution state
-     * @param propertyName The name of the property to retrieve
-     *
-     * @return The specified property, or Undefined
-     */
-    Value get(ExecState *exec, const Identifier &propertyName) const;
-    Value get(ExecState *exec, unsigned propertyName) const;
-
-    /**
-     * Sets the specified property.
-     *
-     * See ECMA 8.6.2.2
-     *
-     * @param exec The current execution state
-     * @param propertyName The name of the property to set
-     * @param propertyValue The value to set
-     */
-    void put(ExecState *exec, const Identifier &propertyName,
-             const Value &value, int attr = None);
-    void put(ExecState *exec, unsigned propertyName,
-             const Value &value, int attr = None);
-
-    /**
-     * Used to check whether or not a particular property is allowed to be set
-     * on an object
-     *
-     * See ECMA 8.6.2.3
-     *
-     * @param exec The current execution state
-     * @param propertyName The name of the property
-     * @return true if the property can be set, otherwise false
-     */
-    bool canPut(ExecState *exec, const Identifier &propertyName) const;
-
-    /**
-     * Checks to see whether the object (or any object in it's prototype chain)
-     * has a property with the specified name.
-     *
-     * See ECMA 8.6.2.4
-     *
-     * @param exec The current execution state
-     * @param propertyName The name of the property to check for
-     * @return true if the object has the property, otherwise false
-     */
-    bool hasProperty(ExecState *exec, const Identifier &propertyName) const;
-    bool hasProperty(ExecState *exec, unsigned propertyName) const;
-
-    /**
-     * Checks to see whether the object has a property with the specified name.
-     *
-     * See ECMA 15.2.4.5
-     *
-     * @param exec The current execution state
-     * @param propertyName The name of the property to check for
-     * @return true if the object has the property, otherwise false
-     */
-    bool hasOwnProperty(ExecState *exec, const Identifier &propertyName) const;
-    bool hasOwnProperty(ExecState *exec, unsigned propertyName) const;
-
-    /**
-     * Removes the specified property from the object.
-     *
-     * See ECMA 8.6.2.5
-     *
-     * @param exec The current execution state
-     * @param propertyName The name of the property to delete
-     * @return true if the property was successfully deleted or did not
-     * exist on the object. false if deleting the specified property is not
-     * allowed.
-     */
-    bool deleteProperty(ExecState *exec, const Identifier &propertyName);
-    bool deleteProperty(ExecState *exec, unsigned propertyName);
-
-    /**
-     * Converts the object into a primitive value. The value return may differ
-     * depending on the supplied hint
-     *
-     * See ECMA 8.6.2.6
-     *
-     * @param exec The current execution state
-     * @param hint The desired primitive type to convert to
-     * @return A primitive value converted from the objetc. Note that the
-     * type of primitive value returned may not be the same as the requested
-     * hint.
-     */
-    Value defaultValue(ExecState *exec, Type hint) const;
-
-    /**
-     * Whether or not the object implements the construct() method. If this
-     * returns false you should not call the construct() method on this
-     * object (typically, an assertion will fail to indicate this).
-     *
-     * @return true if this object implements the construct() method, otherwise
-     * false
-     */
-    bool implementsConstruct() const;
-
-    /**
-     * Creates a new object based on this object. Typically this means the
-     * following:
-     * 1. A new object is created
-     * 2. The prototype of the new object is set to the value of this object's
-     *    "prototype" property
-     * 3. The call() method of this object is called, with the new object
-     *    passed as the this value
-     * 4. The new object is returned
-     *
-     * In some cases, Host objects may differ from these semantics, although
-     * this is discouraged.
-     *
-     * If an error occurs during construction, the execution state's exception
-     * will be set. This can be tested for with ExecState::hadException().
-     * Under some circumstances, the exception object may also be returned.
-     *
-     * Note: This function should not be called if implementsConstruct() returns
-     * false, in which case it will result in an assertion failure.
-     *
-     * @param exec The current execution state
-     * @param args The arguments to be passed to call() once the new object has
-     * been created
-     * @return The newly created &amp; initialized object
-     */
-    Object construct(ExecState *exec, const List &args);
-    Object construct(ExecState *exec, const List &args, const UString &sourceURL, int lineNumber);
-
-    /**
-     * Whether or not the object implements the call() method. If this returns
-     * false you should not call the call() method on this object (typically,
-     * an assertion will fail to indicate this).
-     *
-     * @return true if this object implements the call() method, otherwise
-     * false
-     */
-    bool implementsCall() const;
-
-
-    /**
-     * Calls this object as if it is a function.
-     *
-     * Note: This function should not be called if implementsCall() returns
-     * false, in which case it will result in an assertion failure.
-     *
-     * See ECMA 8.6.2.3
-     *
-     * @param exec The current execution state
-     * @param thisObj The obj to be used as "this" within function execution.
-     * Note that in most cases this will be different from the C++ "this"
-     * object. For example, if the ECMAScript code "window.location.toString()"
-     * is executed, call() will be invoked on the C++ object which implements
-     * the toString method, with the thisObj being window.location
-     * @param args List of arguments to be passed to the function
-     * @return The return value from the function
-     */
-    Value call(ExecState *exec, Object &thisObj, const List &args);
-
-    /**
-     * Whether or not the object implements the hasInstance() method. If this
-     * returns false you should not call the hasInstance() method on this
-     * object (typically, an assertion will fail to indicate this).
-     *
-     * @return true if this object implements the hasInstance() method,
-     * otherwise false
-     */
-    bool implementsHasInstance() const;
-
-    /**
-     * Checks whether value delegates behavior to this object. Used by the
-     * instanceof operator.
-     *
-     * @param exec The current execution state
-     * @param value The value to check
-     * @return true if value delegates behavior to this object, otherwise
-     * false
-     */
-    Boolean hasInstance(ExecState *exec, const Value &value);
-
-    /**
-     * Returns the scope of this object. This is used when execution declared
-     * functions - the execution context for the function is initialized with
-     * extra object in it's scope. An example of this is functions declared
-     * inside other functions:
-     *
-     * \code
-     * function f() {
-     *
-     *   function b() {
-     *     return prototype;
-     *   }
-     *
-     *   var x = 4;
-     *   // do some stuff
-     * }
-     * f.prototype = new String();
-     * \endcode
-     *
-     * When the function f.b is executed, its scope will include properties of
-     * f. So in the example above the return value of f.b() would be the new
-     * String object that was assigned to f.prototype.
-     *
-     * @param exec The current execution state
-     * @return The function's scope
-     */
-    const ScopeChain &scope() const;
-    void setScope(const ScopeChain &s);
-
-    /**
-     * Returns a List of References to all the properties of the object. Used
-     * in "for x in y" statements. The list is created new, so it can be freely
-     * modified without affecting the object's properties. It should be deleted
-     * by the caller.
-     *
-     * Subclasses can override this method in ObjectImpl to provide the
-     * appearance of
-     * having extra properties other than those set specifically with put().
-     *
-     * @param exec The current execution state
-     * @param recursive Whether or not properties in the object's prototype
-     * chain should be
-     * included in the list.
-     * @return A List of References to properties of the object.
-     **/
-    ReferenceList propList(ExecState *exec, bool recursive = true);
-
-    /**
-     * Returns the internal value of the object. This is used for objects such
-     * as String and Boolean which are wrappers for native types. The interal
-     * value is the actual value represented by the wrapper objects.
-     *
-     * @see ECMA 8.6.2
-     * @return The internal value of the object
-     */
-    Value internalValue() const;
-
-    /**
-     * Sets the internal value of the object
-     *
-     * @see internalValue()
-     *
-     * @param v The new internal value
-     */
-    void setInternalValue(const Value &v);
-
-    void saveProperties(SavedProperties &p) const;
-    void restoreProperties(const SavedProperties &p);
-  };
-
   inline Object Value::toObject(ExecState *exec) const { return rep->dispatchToObject(exec); }
   
@@ -510 +204 @@
     bool getProperty(ExecState *exec, unsigned propertyName, Value& result) const;
 
-    virtual bool getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const;
-    virtual bool getOwnProperty(ExecState *exec, unsigned propertyName, Value& result) const;
+    bool getPropertySlot(ExecState *, const Identifier&, PropertySlot&);
+    bool getPropertySlot(ExecState *, unsigned, PropertySlot&);
+    virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
+    virtual bool getOwnPropertySlot(ExecState *, unsigned index, PropertySlot&);
 
     /**
@@ -538 +234 @@
      * @see Object::hasProperty()
      */
-    bool hasProperty(ExecState *exec,
-                             const Identifier &propertyName) const;
+    bool hasProperty(ExecState *exec, const Identifier &propertyName) const;
     bool hasProperty(ExecState *exec, unsigned propertyName) const;
 
-    virtual bool hasOwnProperty(ExecState *exec,
-                     const Identifier &propertyName) const;
-    virtual bool hasOwnProperty(ExecState *exec, unsigned propertyName) const;
+    virtual bool hasOwnProperty(ExecState *exec, const Identifier &propertyName) const;
 
     /**
@@ -624 +317 @@
     ValueImp *getDirect(const Identifier& propertyName) const
         { return _prop.get(propertyName); }
+    ValueImp **getDirectLocation(const Identifier& propertyName)
+        { return _prop.getLocation(propertyName); }
     void putDirect(const Identifier &propertyName, ValueImp *value, int attr = 0);
     void putDirect(const Identifier &propertyName, int value, int attr = 0);
@@ -639 +334 @@
   };
 
-
   // it may seem crazy to inline a function this large but it makes a big difference
   // since this is function very hot in variable lookup
-  inline bool ObjectImp::getProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
+  inline bool ObjectImp::getPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
   {
-    const ObjectImp *imp = this;
+    ObjectImp *imp = this;
 
     while (true) {
-      if (imp->getOwnProperty(exec, propertyName, result))
+      if (imp->getOwnPropertySlot(exec, propertyName, slot))
         return true;
       
-      const ValueImp *proto = imp->_proto;
+      ValueImp *proto = imp->_proto;
       if (proto->dispatchType() != ObjectType)
         break;
       
-      imp = static_cast<const ObjectImp *>(proto);
+      imp = static_cast<ObjectImp *>(proto);
     }
     
@@ -663 +357 @@
   // but it makes a big difference to property lookup if subclasses can inline their
   // superclass call to this
-  inline bool ObjectImp::getOwnProperty(ExecState *exec, const Identifier &propertyName, Value &result) const
+  inline bool ObjectImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
   {
-      ValueImp *imp = getDirect(propertyName);
-      if (imp) {
-        result = Value(imp);
+      ValueImp **impLocation = getDirectLocation(propertyName);
+      if (impLocation) {
+        slot.setValueSlot(this, impLocation);
         return true;
       }
 
       // non-standard netscape extension
-      if (propertyName == specialPrototypePropertyName) {
-        result = Value(_proto);
+      if (propertyName == exec->dynamicInterpreter()->specialPrototypeIdentifier()) {
+        slot.setValueSlot(this, &_proto);
         return true;
       }
@@ -760 +454 @@
     { return imp()->hasProperty(exec, propertyName); }
 
-  inline bool Object::hasProperty(ExecState *exec, unsigned propertyName) const
-    { return imp()->hasProperty(exec, propertyName); }
-
   inline bool Object::hasOwnProperty(ExecState *exec, const Identifier &propertyName) const
-    { return imp()->hasOwnProperty(exec, propertyName); }
-
-  inline bool Object::hasOwnProperty(ExecState *exec, unsigned propertyName) const
     { return imp()->hasOwnProperty(exec, propertyName); }
 

trunk/JavaScriptCore/kjs/property_map.cpp

@@ -233 +233 @@
 }
 
+ValueImp **PropertyMap::getLocation(const Identifier &name)
+{
+    assert(!name.isNull());
+    
+    UString::Rep *rep = name._ustring.rep;
+
+    if (!_table) {
+#if USE_SINGLE_ENTRY
+        UString::Rep *key = _singleEntry.key;
+        if (rep == key)
+            return &_singleEntry.value;
+#endif
+        return 0;
+    }
+    
+    unsigned h = rep->hash();
+    int sizeMask = _table->sizeMask;
+    Entry *entries = _table->entries;
+    int i = h & sizeMask;
+    int k = 0;
+#if DUMP_STATISTICS
+    ++numProbes;
+    numCollisions += entries[i].key && entries[i].key != rep;
+#endif
+    while (UString::Rep *key = entries[i].key) {
+        if (rep == key)
+            return &entries[i].value;
+        if (k == 0)
+            k = 1 | (h % sizeMask);
+        i = (i + k) & sizeMask;
+#if DUMP_STATISTICS
+        ++numRehashes;
+#endif
+    }
+    return 0;
+}
+
 #if DEBUG_PROPERTIES
 static void printAttributes(int attributes)

trunk/JavaScriptCore/kjs/property_map.h

@@ -79 +79 @@
         ValueImp *get(const Identifier &name) const;
         ValueImp *get(const Identifier &name, int &attributes) const;
+        ValueImp **getLocation(const Identifier &name);
 
         void mark() const;

trunk/JavaScriptCore/kjs/protect.h

@@ -25 +25 @@
 #define _KJS_PROTECT_H_
 
-#include "object.h"
 #include "reference.h"
 #include "value.h"
@@ -78 +77 @@
     };
 
-
-    class ProtectedObject : public Object {
-    public:
-      ProtectedObject() : Object() {}
-      ProtectedObject(const Object &o)  : Object(o) { gcProtectNullTolerant(o.imp()); };
-      ProtectedObject(const ProtectedObject &o)  : Object(o) { gcProtectNullTolerant(o.imp()); };
-      ~ProtectedObject() { gcUnprotectNullTolerant(imp());}
-      ProtectedObject& operator=(const Object &o)
-        { 
-          ValueImp *old = imp();
-          Object::operator=(o); 
-          gcProtectNullTolerant(o.imp());
-          gcUnprotectNullTolerant(old); 
-          return *this;
-        }
-      ProtectedObject& operator=(const ProtectedObject &o)
-        { 
-          ValueImp *old = imp();
-          Object::operator=(o); 
-          gcProtectNullTolerant(o.imp());
-          gcUnprotectNullTolerant(old); 
-          return *this;
-        }
-    private:
-      explicit ProtectedObject(ObjectImp *o);
-    };
-
-
-    class ProtectedReference : public Reference {
-    public:
-      ProtectedReference(const Reference&r)  : Reference(r) { gcProtectNullTolerant(r.base.imp()); };
-      ~ProtectedReference() { gcUnprotectNullTolerant(base.imp());}
-      ProtectedReference& operator=(const Reference &r)
-        { 
-          ValueImp *old = base.imp();
-          Reference::operator=(r); 
-          gcProtectNullTolerant(r.base.imp());
-          gcUnprotectNullTolerant(old); 
-          return *this;
-        }
-    private:
-      ProtectedReference();
-      ProtectedReference(const Object& b, const Identifier& p);
-      ProtectedReference(const Object& b, unsigned p);
-      ProtectedReference(ObjectImp *b, const Identifier& p);
-      ProtectedReference(ObjectImp *b, unsigned p);
-      ProtectedReference(const Null& b, const Identifier& p);
-      ProtectedReference(const Null& b, unsigned p);
-    };
-
-}
+} // namespace
 
 #endif

trunk/JavaScriptCore/kjs/reference.h

@@ -28 +28 @@
 
 namespace KJS {
+
+  class Object;
+  class ObjectImp;
 
   class Reference {

trunk/JavaScriptCore/kjs/reference_list.cpp

@@ -23 +23 @@
 #include "reference_list.h"
 
-#include "protect.h"
+#include "protected_object.h"
 
 namespace KJS {

trunk/JavaScriptCore/kjs/regexp_object.cpp

@@ -217 +217 @@
 }
 
-bool RegExpObjectImp::getOwnProperty(ExecState *exec, const Identifier& p, Value& result) const
-{
-  UString s = p.ustring();
+Value RegExpObjectImp::backrefGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
+{
+  RegExpObjectImp *thisObj = static_cast<RegExpObjectImp *>(slot.slotBase());
+  unsigned long i = slot.index();
+
+  if (i < thisObj->lastNrSubPatterns + 1) {
+    int *lastOvector = thisObj->lastOvector;
+    UString substring = thisObj->lastString.substr(lastOvector[2*i], lastOvector[2*i+1] - lastOvector[2*i] );
+    return String(substring);
+  } 
+
+  return String("");
+}
+
+bool RegExpObjectImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
+{
+  UString s = propertyName.ustring();
   if (s[0] == '$' && lastOvector)
   {
@@ -226 +240 @@
     if (ok)
     {
-      if (i < lastNrSubPatterns + 1)
-      {
-        UString substring = lastString.substr( lastOvector[2*i], lastOvector[2*i+1] - lastOvector[2*i] );
-        result = String(substring);
-      } else
-        result = String("");
-      
+      slot.setCustomIndex(this, i, backrefGetter);
       return true;
     }
   }
 
-  return InternalFunctionImp::getOwnProperty(exec, p, result);
+  return InternalFunctionImp::getOwnPropertySlot(exec, propertyName, slot);
 }
 

trunk/JavaScriptCore/kjs/regexp_object.h

@@ -75 +75 @@
     virtual Value call(ExecState *exec, Object &thisObj, const List &args);
 
-    virtual bool getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const;
+    virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
     int ** registerRegexp( const RegExp* re, const UString& s );
     void setSubPatterns(int num) { lastNrSubPatterns = num; }
     Object arrayOfMatches(ExecState *exec, const UString &result) const;
   private:
+    static Value backrefGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
+  
     UString lastString;
     int *lastOvector;

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -51 +51 @@
 }
 
-bool StringInstanceImp::getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
+Value StringInstanceImp::lengthGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot &slot)
+{
+    return Value(static_cast<StringInstanceImp *>(slot.slotBase())->internalValue().toString(exec).size());
+}
+
+Value StringInstanceImp::indexGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot &slot)
+{
+    const UChar c = static_cast<StringInstanceImp *>(slot.slotBase())->internalValue().toString(exec)[slot.index()];
+    return Value(UString(&c, 1));
+}
+
+bool StringInstanceImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot &slot)
 {
   if (propertyName == lengthPropertyName) {
-    result = Value(internalValue().toString(exec).size());
+    slot.setCustom(this, lengthGetter);
     return true;
   }
@@ -64 +75 @@
     const unsigned length = s.size();
     if (index >= length)
-      return Undefined();
-    const UChar c = s[index];
-    result = Value(UString(&c, 1));
+      return false;
+    slot.setCustomIndex(this, index, indexGetter);
     return true;
   }
 
-  return ObjectImp::getOwnProperty(exec, propertyName, result);
+  return ObjectImp::getOwnPropertySlot(exec, propertyName, slot);
 }
 
@@ -78 +88 @@
     return;
   ObjectImp::put(exec, propertyName, value, attr);
-}
-
-bool StringInstanceImp::hasOwnProperty(ExecState *exec, const Identifier &propertyName) const
-{
-  if (propertyName == lengthPropertyName)
-    return true;
-
-  bool ok;
-  const unsigned index = propertyName.toArrayIndex(&ok);
-  if (ok) {
-    const unsigned length = internalValue().toString(exec).size();
-    if (index < length)
-      return true;
-  }
-
-  return ObjectImp::hasOwnProperty(exec, propertyName);
 }
 
@@ -155 +149 @@
 }
 
-bool StringPrototypeImp::getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const
-{
-  return lookupGetOwnFunction<StringProtoFuncImp, StringInstanceImp>(exec, propertyName, &stringTable, this, result);
+bool StringPrototypeImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot &slot)
+{
+  return getStaticFunctionSlot<StringProtoFuncImp, StringInstanceImp>(exec, &stringTable, this, propertyName, slot);
 }
 

trunk/JavaScriptCore/kjs/string_object.h

@@ -33 +33 @@
     StringInstanceImp(ObjectImp *proto, const UString &string);
 
-    virtual bool getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const;
+    virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
     virtual void put(ExecState *exec, const Identifier &propertyName, const Value &value, int attr = None);
-    virtual bool hasOwnProperty(ExecState *exec, const Identifier &propertyName) const;
     virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
 
     virtual const ClassInfo *classInfo() const { return &info; }
     static const ClassInfo info;
+  private:
+    static Value lengthGetter(ExecState *exec, const Identifier&, const PropertySlot &slot);
+    static Value indexGetter(ExecState *exec, const Identifier&, const PropertySlot &slot);
   };
 
@@ -52 +54 @@
     StringPrototypeImp(ExecState *exec,
                        ObjectPrototypeImp *objProto);
-    virtual bool getOwnProperty(ExecState *exec, const Identifier& propertyName, Value& result) const;
+    virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
     virtual const ClassInfo *classInfo() const { return &info; }
     static const ClassInfo info;