Changeset 10857 in webkit for trunk/JavaScriptCore/kjs/array_object.cpp

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

File:

• trunk/JavaScriptCore/kjs/array_object.cpp (modified) (5 diffs)

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++;
     }