Changeset 11836 in webkit for trunk/JavaScriptCore/kjs/object.cpp

Timestamp:

Dec 30, 2005, 1:44:50 AM (19 years ago)

Author:

andersca

Message:

2005-12-30 Anders Carlsson <​[email protected]>

Reviewed by Maciej.

• Fix ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6298 Getter setter test is failing

• kjs/object.cpp: (KJS::JSObject::put):

Rework the getter setter part. We now walk the prototype chain, checking for
getter/setter properties and only take the slow path if any are found.

File:

• trunk/JavaScriptCore/kjs/object.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/object.cpp

@@ -219 +219 @@
   }
 
+  // Check if there are any setters or getters in the prototype chain
   JSObject *obj = this;
+  bool hasGettersOrSetters = false;
   while (true) {
-    JSValue *gs;
-    int attributes;
-    if (obj->_prop.hasGetterSetterProperties() && (gs = obj->_prop.get(propertyName, attributes))) {
-      if (attributes & GetterSetter) {
-        JSObject *setterFunc = static_cast<GetterSetterImp *>(gs)->getSetter();
-            
-        if (!setterFunc) {
-          throwSetterError(exec);
-          return;
-        }
-            
-        List args;
-        args.append(value);
-        
-        setterFunc->call(exec, this, args);
-        return;
-      } else  {
-        // If there's an existing property on the object or one of its 
-        // prototype it should be replaced, so we just break here.
-        break;
-      }
-    }
-     
+    if (obj->_prop.hasGetterSetterProperties()) {
+      hasGettersOrSetters = true;
+      break;
+    }
+      
     if (!obj->_proto->isObject())
       break;
+      
+    obj = static_cast<JSObject *>(obj->_proto);
+  }
+  
+  if (hasGettersOrSetters) {
+    obj = this;
+    while (true) {
+      int attributes;
+      if (JSValue *gs = obj->_prop.get(propertyName, attributes)) {
+        if (attributes & GetterSetter) {
+          JSObject *setterFunc = static_cast<GetterSetterImp *>(gs)->getSetter();
         
-    obj = static_cast<JSObject *>(obj->_proto);
-  }
-
+          if (!setterFunc) {
+            throwSetterError(exec);
+            return;
+          }
+            
+          List args;
+          args.append(value);
+        
+          setterFunc->call(exec, this, args);
+          return;
+        } else {
+          // If there's an existing property on the object or one of its 
+          // prototype it should be replaced, so we just break here.
+          break;
+        }
+      }
+     
+      if (!obj->_proto->isObject())
+        break;
+        
+      obj = static_cast<JSObject *>(obj->_proto);
+    }
+  }
+  
   _prop.put(propertyName,value,attr);
 }