Changeset 28346 in webkit for trunk/JavaScriptCore/kjs/array_instance.cpp

Timestamp:

Dec 3, 2007, 7:46:14 AM (17 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

Reviewed by Mitz.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=15848 <rdar://problem/5619330> REGRESSION: Assertion failure viewing comments page on digg.com

Test: fast/js/sparse-array.html

• kjs/array_instance.cpp: (KJS::ArrayInstance::inlineGetOwnPropertySlot): Check sparse array cutoff before looking in hash map. Can't avoid the branch because we can't look for 0 in the hash. (KJS::ArrayInstance::deleteProperty): Ditto.

LayoutTests:

Reviewed by Mitz.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=15848 <rdar://problem/5619330> REGRESSION: Assertion failure viewing comments page on digg.com

• fast/js/resources/sparse-array.js: Added.
• fast/js/sparse-array-expected.txt: Added.
• fast/js/sparse-array.html: Added.

File:

• trunk/JavaScriptCore/kjs/array_instance.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/array_instance.cpp

@@ -152 +152 @@
         }
     } else if (SparseArrayValueMap* map = storage->m_sparseValueMap) {
-        SparseArrayValueMap::iterator it = map->find(i);
-        if (it != map->end()) {
-            slot.setValueSlot(this, &it->second);
-            return true;
+        if (i >= sparseArrayCutoff) {
+            SparseArrayValueMap::iterator it = map->find(i);
+            if (it != map->end()) {
+                slot.setValueSlot(this, &it->second);
+                return true;
+            }
         }
     }
@@ -319 +321 @@
 
     if (SparseArrayValueMap* map = storage->m_sparseValueMap) {
-        SparseArrayValueMap::iterator it = map->find(i);
-        if (it != map->end()) {
-            map->remove(it);
-            return true;
+        if (i >= sparseArrayCutoff) {
+            SparseArrayValueMap::iterator it = map->find(i);
+            if (it != map->end()) {
+                map->remove(it);
+                return true;
+            }
         }
     }