Changeset 11903 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Jan 6, 2006, 12:32:20 AM (19 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Eric.

• fix remaining performance regression from Getter/Setter change ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6249

• Activation objects should not have proto property ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6395

• kjs/function.cpp: (KJS::ActivationImp::getOwnPropertySlot): Implement directly, thus skipping getter/setter handling and proto handling, as well as inlining needed superclass stuff. (KJS::ActivationImp::put): Implement directly, skipping getter/setter, proto, and do canPut directly in PropertyMap::put since there's no static property table either.
• kjs/function.h:
• kjs/property_map.cpp: (KJS::PropertyMap::put): Allow optionally inlining canPut check.
• kjs/property_map.h:

LayoutTests:

Reviewed by Eric.

• test case for 6396: Activation objects should not have proto property ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6395

• fast/js/activation-proto-expected.txt: Added.
• fast/js/activation-proto.html: Added.

Location:

trunk/JavaScriptCore/kjs

Files:

• function.cpp (modified) (2 diffs)
• function.h (modified) (1 diff)
• property_map.cpp (modified) (3 diffs)
• property_map.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/function.cpp

@@ -509 +509 @@
 {
     // do this first so property map arguments property wins over the below
-    if (JSObject::getOwnPropertySlot(exec, propertyName, slot))
+    // we don't call JSObject because we won't have getter/setter properties
+    // and we don't want to support __proto__
+
+    if (JSValue **location = getDirectLocation(propertyName)) {
+        slot.setValueSlot(this, location);
         return true;
+    }
 
     if (propertyName == exec->dynamicInterpreter()->argumentsIdentifier()) {
@@ -525 +530 @@
         return false;
     return JSObject::deleteProperty(exec, propertyName);
+}
+
+void ActivationImp::put(ExecState *exec, const Identifier &propertyName, JSValue *value, int attr)
+{
+  // There's no way that an activation object can have a prototype or getter/setter properties
+  assert(!_prop.hasGetterSetterProperties());
+  assert(!_proto);
+
+  _prop.put(propertyName, value, attr, (attr == None || attr == DontDelete));
 }
 

trunk/JavaScriptCore/kjs/function.h

@@ -127 +127 @@
 
     virtual bool getOwnPropertySlot(ExecState *exec, const Identifier &, PropertySlot&);
+    virtual void put(ExecState *exec, const Identifier &propertyName, JSValue *value, int attr = None);
     virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
 

trunk/JavaScriptCore/kjs/property_map.cpp

@@ -289 +289 @@
 #endif
 
-void PropertyMap::put(const Identifier &name, JSValue *value, int attributes)
+void PropertyMap::put(const Identifier &name, JSValue *value, int attributes, bool roCheck)
 {
     assert(!name.isNull());
@@ -308 +308 @@
         UString::Rep *key = _singleEntry.key;
         if (key) {
-            if (rep == key) {
+            if (rep == key && !(roCheck && (_singleEntry.attributes & ReadOnly))) {
                 _singleEntry.value = value;
                 return;
@@ -339 +339 @@
     while (UString::Rep *key = entries[i].key) {
         if (rep == key) {
+            if (roCheck && (_table->entries[i].attributes & ReadOnly)) 
+                return;
             // Put a new value in an existing hash table entry.
             entries[i].value = value;

trunk/JavaScriptCore/kjs/property_map.h

@@ -76 +76 @@
         void clear();
         
-        void put(const Identifier &name, JSValue *value, int attributes);
+        void put(const Identifier &name, JSValue *value, int attributes, bool roCheck = false);
         void remove(const Identifier &name);
         JSValue *get(const Identifier &name) const;