Changeset 10857 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Oct 15, 2005, 5:46:25 PM (20 years ago)

Author:

mjs

Message:

Reverted fix for this bug, because it was part of a time range that caused a performance
regression:

<rdar://problem/4260481> Remove Reference type from JavaScriptCore

Location:

trunk/JavaScriptCore/kjs

Files:

• IdentifierSequencedSet.cpp (deleted)
• IdentifierSequencedSet.h (deleted)
• array_instance.h (modified) (1 diff)
• array_object.cpp (modified) (5 diffs)
• nodes.cpp (modified) (4 diffs)
• nodes.h (modified) (1 diff)
• object.cpp (modified) (4 diffs)
• object.h (modified) (2 diffs)
• property_map.cpp (modified) (8 diffs)
• property_map.h (modified) (2 diffs)
• protect.h (modified) (1 diff)
• protected_reference.h (added)
• reference.cpp (added)
• reference.h (added)
• reference_list.cpp (added)
• reference_list.h (added)
• ustring.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/array_instance.h

@@ -40 +40 @@
     virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
     virtual bool deleteProperty(ExecState *exec, unsigned propertyName);
-    virtual void getPropertyNames(ExecState *exec, IdentifierSequencedSet& propertyNames);
+    virtual ReferenceList propList(ExecState *exec, bool recursive);
 
     virtual void mark();

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -29 +29 @@
 #include "object.h"
 #include "operations.h"
+#include "reference_list.h"
 #include "types.h"
 #include "value.h"
-#include "IdentifierSequencedSet.h"
 
 #include "array_object.lut.h"
@@ -186 +186 @@
 }
 
-void ArrayInstanceImp::getPropertyNames(ExecState *exec, IdentifierSequencedSet& propertyNames)
-{
+ReferenceList ArrayInstanceImp::propList(ExecState *exec, bool recursive)
+{
+  ReferenceList properties = ObjectImp::propList(exec,recursive);
+
   // avoid fetching this every time through the loop
   ValueImp *undefined = jsUndefined();
@@ -193 +195 @@
   for (unsigned i = 0; i < storageLength; ++i) {
     ValueImp *imp = storage[i];
-    if (imp && imp != undefined)
-      propertyNames.insert(Identifier::from(i));
-  }
-
-  ObjectImp::getPropertyNames(exec, propertyNames);
+    if (imp && imp != undefined) {
+      properties.append(Reference(this, i));
+    }
+  }
+  return properties;
 }
 
@@ -229 +231 @@
 
   if (newLength < length) {
-    IdentifierSequencedSet sparseProperties;
-    
-    _prop.getSparseArrayPropertyNames(sparseProperties);
-
-    IdentifierSequencedSetIterator end = sparseProperties.end();
-    
-    for (IdentifierSequencedSetIterator it = sparseProperties.begin(); it != end; ++it) {
-      Identifier name = *it;
+    ReferenceList sparseProperties;
+    
+    _prop.addSparseArrayPropertiesToReferenceList(sparseProperties, this);
+    
+    ReferenceListIterator it = sparseProperties.begin();
+    while (it != sparseProperties.end()) {
+      Reference ref = it++;
       bool ok;
-      unsigned index = name.toArrayIndex(&ok);
-      if (ok && index > newLength)
-        deleteProperty(exec, name);
+      unsigned index = ref.getPropertyName(exec).toArrayIndex(&ok);
+      if (ok && index > newLength) {
+        ref.deleteValue(exec);
+      }
     }
   }
@@ -347 +349 @@
     }
     
-    IdentifierSequencedSet sparseProperties;
-    _prop.getSparseArrayPropertyNames(sparseProperties);
-    unsigned newLength = o + sparseProperties.size();
-
-    if (newLength > storageLength)
+    ReferenceList sparseProperties;
+    _prop.addSparseArrayPropertiesToReferenceList(sparseProperties, this);
+    unsigned newLength = o + sparseProperties.length();
+
+    if (newLength > storageLength) {
       resizeStorage(newLength);
-
-    IdentifierSequencedSetIterator end = sparseProperties.end();
-    for (IdentifierSequencedSetIterator it = sparseProperties.begin(); it != end; ++it) {
-      Identifier name = *it;
-      storage[o] = get(exec, name);
-      ObjectImp::deleteProperty(exec, name);
+    } 
+
+    ReferenceListIterator it = sparseProperties.begin();
+    while (it != sparseProperties.end()) {
+      Reference ref = it++;
+      storage[o] = ref.getValue(exec);
+      ObjectImp::deleteProperty(exec, ref.getPropertyName(exec));
       o++;
     }

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -44 +44 @@
 #include "operations.h"
 #include "ustring.h"
-#include "IdentifierSequencedSet.h"
+#include "reference_list.h"
 
 using namespace KJS;
@@ -1770 +1770 @@
   ObjectImp *v;
   Completion c;
-  IdentifierSequencedSet propertyNames;
+  ReferenceList propList;
 
   if (varDecl) {
@@ -1789 +1789 @@
   KJS_CHECKEXCEPTION
   v = e->toObject(exec);
-  v->getPropertyNames(exec, propertyNames);
-
-  IdentifierSequencedSetIterator end = propertyNames.end();
-  for (IdentifierSequencedSetIterator it = propertyNames.begin(); it != end; ++it) {
-    const Identifier &name = *it;
-    if (!v->hasProperty(exec, name))
+  propList = v->propList(exec);
+
+  ReferenceListIterator propIt = propList.begin();
+
+  while (propIt != propList.end()) {
+    Identifier name = propIt->getPropertyName(exec);
+    if (!v->hasProperty(exec, name)) {
+      propIt++;
       continue;
+    }
 
     ValueImp *str = jsString(name.ustring());
@@ -1857 +1860 @@
       }
     }
+
+    propIt++;
   }
 

trunk/JavaScriptCore/kjs/nodes.h

@@ -35 +35 @@
   class PropertyNode;
   class PropertyValueNode;
+  class Reference;
   class RegExp;
   class SourceElementsNode;

trunk/JavaScriptCore/kjs/object.cpp

@@ -29 +29 @@
 #include "interpreter.h"
 #include "lookup.h"
-#include "IdentifierSequencedSet.h"
+#include "reference_list.h"
 
 #include <assert.h>
@@ -375 +375 @@
 }
 
-void ObjectImp::getPropertyNames(ExecState *exec, IdentifierSequencedSet &propertyNames)
-{
-  _prop.getEnumerablePropertyNames(propertyNames);
+ReferenceList ObjectImp::propList(ExecState *exec, bool recursive)
+{
+  ReferenceList list;
+  if (_proto->isObject() && recursive)
+    list = static_cast<ObjectImp*>(_proto)->propList(exec,recursive);
+
+  _prop.addEnumerablesToReferenceList(list, this);
 
   // Add properties from the static hashtable of properties
@@ -386 +390 @@
       const HashEntry *e = info->propHashTable->entries;
       for (int i = 0; i < size; ++i, ++e) {
-        if (e->s && !(e->attr & DontEnum))
-          propertyNames.insert(e->s);
+        if ( e->s && !(e->attr & DontEnum) )
+          list.append(Reference(this, e->s)); /// ######### check for duplicates with the propertymap
       }
     }
@@ -393 +397 @@
   }
 
-  if (_proto->isObject())
-    static_cast<ObjectImp*>(_proto)->getPropertyNames(exec, propertyNames);
+  return list;
 }
 

trunk/JavaScriptCore/kjs/object.h

@@ -48 +48 @@
   class HashEntry;
   class ListImp;
-  class IdentifierSequencedSet;
 
   // ECMA 262-3 8.6.1
@@ -424 +423 @@
      *
      * @param exec The current execution state
-     * @param propertyNames A list of property names to be filled in by this call
+     * @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.
      **/
-    virtual void getPropertyNames(ExecState *exec, IdentifierSequencedSet& propertyNames);
+    virtual ReferenceList propList(ExecState *exec, bool recursive = true);
 
     /**

trunk/JavaScriptCore/kjs/property_map.cpp

@@ -26 +26 @@
 #include "object.h"
 #include "protect.h"
-#include "IdentifierSequencedSet.h"
+#include "reference_list.h"
 
 #include <algorithm>
@@ -75 +75 @@
 
 // lastIndexUsed is an ever-increasing index used to identify the order items
-// were inserted into the property map. It's vital that getEnumerablePropertyNames
+// were inserted into the property map. It's vital that addEnumerablesToReferenceList
 // return the properties in the order they were added for compatibility with other
 // browsers' JavaScript implementations.
@@ -567 +567 @@
 }
 
-void PropertyMap::getEnumerablePropertyNames(IdentifierSequencedSet& propertyNames) const
+void PropertyMap::addEnumerablesToReferenceList(ReferenceList &list, ObjectImp *base) const
 {
     if (!_table) {
@@ -573 +573 @@
         UString::Rep *key = _singleEntry.key;
         if (key && !(_singleEntry.attributes & DontEnum))
-            propertyNames.insert(Identifier(key));
+            list.append(Reference(base, Identifier(key)));
 #endif
         return;
@@ -599 +599 @@
     qsort(sortedEnumerables, p - sortedEnumerables, sizeof(sortedEnumerables[0]), comparePropertyMapEntryIndices);
 
-    // Put the keys of the sorted entries into the list.
+    // Put the keys of the sorted entries into the reference list.
     Entry **q = sortedEnumerables;
-    while (q != p) {
-        propertyNames.insert(Identifier(q[0]->key));
-        ++q;
-    }
+    while (q != p)
+        list.append(Reference(base, Identifier((*q++)->key)));
 
     // Deallocate the buffer.
@@ -611 +609 @@
 }
 
-void PropertyMap::getSparseArrayPropertyNames(IdentifierSequencedSet& propertyNames) const
+void PropertyMap::addSparseArrayPropertiesToReferenceList(ReferenceList &list, ObjectImp *base) const
 {
     if (!_table) {
@@ -621 +619 @@
             k.toUInt32(&fitsInUInt32);
             if (fitsInUInt32)
-                propertyNames.insert(Identifier(key));
+                list.append(Reference(base, Identifier(key)));
         }
 #endif
@@ -636 +634 @@
             k.toUInt32(&fitsInUInt32);
             if (fitsInUInt32)
-                propertyNames.insert(Identifier(key));
+                list.append(Reference(base, Identifier(key)));
         }
     }

trunk/JavaScriptCore/kjs/property_map.h

@@ -28 +28 @@
 namespace KJS {
 
-    class IdentifierSequencedSet;
     class ObjectImp;
+    class ReferenceList;
     class ValueImp;
     
@@ -82 +82 @@
 
         void mark() const;
-        void getEnumerablePropertyNames(IdentifierSequencedSet&) const;
-        void getSparseArrayPropertyNames(IdentifierSequencedSet&) const;
+        void addEnumerablesToReferenceList(ReferenceList &, ObjectImp *) const;
+        void addSparseArrayPropertiesToReferenceList(ReferenceList &, ObjectImp *) const;
 
         void save(SavedProperties &) const;

trunk/JavaScriptCore/kjs/protect.h

@@ -25 +25 @@
 #define _KJS_PROTECT_H_
 
+#include "reference.h"
 #include "value.h"
 #include "protected_values.h"

trunk/JavaScriptCore/kjs/ustring.h

@@ -241 +241 @@
 
   public:
-    typedef Rep Impl;
-
     /**
      * Constructs a null string.
@@ -464 +462 @@
     static void globalClear();
 #endif
-
-    Impl *impl() const { return rep; }
   private:
     UString(Rep *r) { attach(r); }