Changeset 36304 in webkit for trunk/JavaScriptCore/kjs/JSObject.cpp

Timestamp:

Sep 9, 2008, 4:42:47 PM (17 years ago)

Author:

[email protected]

Message:

2008-09-09 Sam Weinig <​[email protected]>

Reviewed by Geoffrey Garen.

Replace uses of PropertyMap::get and PropertyMap::getLocation with
PropertyMap::getOffset.

Sunspider reports this as a .6% improvement.

• JavaScriptCore.exp:
• kjs/JSObject.cpp: (JSC::JSObject::put): (JSC::JSObject::deleteProperty): (JSC::JSObject::getPropertyAttributes):
• kjs/JSObject.h: (JSC::JSObject::getDirect): (JSC::JSObject::getDirectLocation): (JSC::JSObject::locationForOffset):
• kjs/PropertyMap.cpp: (JSC::PropertyMap::remove): (JSC::PropertyMap::getOffset):
• kjs/PropertyMap.h:

File:

• trunk/JavaScriptCore/kjs/JSObject.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/JSObject.cpp

@@ -137 +137 @@
     
     unsigned attributes;
-    if (m_structureID->propertyMap().get(propertyName, attributes, m_propertyStorage) && attributes & ReadOnly)
+    if ((m_structureID->propertyMap().getOffset(propertyName, attributes) != WTF::notFound) && attributes & ReadOnly)
         return;
 
     for (JSObject* obj = this; ; obj = static_cast<JSObject*>(prototype)) {
-        if (JSValue* gs = obj->structureID()->propertyMap().get(propertyName, obj->propertyStorage())) {
+        if (JSValue* gs = obj->getDirect(propertyName)) {
             if (gs->isGetterSetter()) {
                 JSObject* setterFunc = static_cast<GetterSetter*>(gs)->setter();        
@@ -203 +203 @@
 {
     unsigned attributes;
-    JSValue* v = m_structureID->propertyMap().get(propertyName, attributes, m_propertyStorage);
-    if (v) {
+    if (m_structureID->propertyMap().getOffset(propertyName, attributes) != WTF::notFound) {
         if ((attributes & DontDelete))
             return false;
@@ -422 +421 @@
 bool JSObject::getPropertyAttributes(ExecState* exec, const Identifier& propertyName, unsigned& attributes) const
 {
-    if (m_structureID->propertyMap().get(propertyName, attributes, m_propertyStorage))
+    if (m_structureID->propertyMap().getOffset(propertyName, attributes) != WTF::notFound)
         return true;