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

Timestamp:

Dec 25, 2007, 2:54:10 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Oliver.

• Remove unnecessary redundant check from property setting ​http://bugs.webkit.org/show_bug.cgi?id=16602

1.3% speedup on SunSpider.

• kjs/object.cpp: (KJS::JSObject::put): Don't do canPut check when not needed; let the PropertyMap handle it. (KJS::JSObject::canPut): Don't check the static property table. lookupPut does that already.

File:

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

trunk/JavaScriptCore/kjs/object.cpp

@@ -227 +227 @@
   // Assume that a C++ implementation knows what it is doing
   // and let it override the canPut() check.
-  if ((attr == None || attr == DontDelete) && !canPut(exec,propertyName)) {
-    return;
-  }
-
+  bool checkReadOnly = !(attr & (ReadOnly | DontEnum | Internal | Function | GetterSetter));
   // Check if there are any setters or getters in the prototype chain
   JSObject *obj = this;
@@ -247 +244 @@
   
   if (hasGettersOrSetters) {
+    if (checkReadOnly && !canPut(exec,propertyName)) {
+      return;
+    }
+
     obj = this;
     while (true) {
@@ -278 +279 @@
   }
   
-  _prop.put(propertyName,value,attr);
+  _prop.put(propertyName, value, attr, checkReadOnly);
 }
 
@@ -294 +295 @@
   // Don't look in the prototype here. We can always put an override
   // in the object, even if the prototype has a ReadOnly property.
-
-  if (!getPropertyAttributes(propertyName, attributes))
+  // Also, there is no need to check the static property table, as this
+  // would have been done by the subclass already.
+
+  if (!_prop.get(propertyName, attributes))
     return true;
-  else
-    return !(attributes & ReadOnly);
+
+  return !(attributes & ReadOnly);
 }