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

Timestamp:

Jun 13, 2007, 9:58:04 PM (18 years ago)

Author:

darin

Message:

JavaScriptCore:

Reviewed by Mark Rowe.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=14132 array sort with > 10000 elements sets elements > 10000 undefined

Test: fast/js/sort-large-array.html

• kjs/array_instance.h: Replaced pushUndefinedObjectsToEnd with compactForSorting, and removed ExecState parameters.

• kjs/array_object.cpp: (ArrayInstance::sort): Changed to call compactForSorting. (ArrayInstance::compactForSorting): Do the get and delete of the properties directly on the property map instead of using public calls from JSObject. The public calls would just read the undefined values from the compacted sort results array!

LayoutTests:

Reviewed by Mark Rowe.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=14132 array sort with > 10000 elements sets elements > 10000 undefined

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

File:

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

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -3 +3 @@
  *  This file is part of the KDE libraries
  *  Copyright (C) 1999-2000 Harri Porten ([email protected])
- *  Copyright (C) 2003 Apple Computer, Inc.
+ *  Copyright (C) 2003, 2007 Apple Inc. All rights reserved.
  *  Copyright (C) 2003 Peter Kelly ([email protected])
  *  Copyright (C) 2006 Alexey Proskuryakov ([email protected])
@@ -331 +331 @@
 void ArrayInstance::sort(ExecState* exec)
 {
-    size_t lengthNotIncludingUndefined = pushUndefinedObjectsToEnd(exec);
+    size_t lengthNotIncludingUndefined = compactForSorting();
       
     ExecState* oldExec = execForCompareByStringForQSort;
@@ -398 +398 @@
 void ArrayInstance::sort(ExecState* exec, JSObject* compareFunction)
 {
-    size_t lengthNotIncludingUndefined = pushUndefinedObjectsToEnd(exec);
+    size_t lengthNotIncludingUndefined = compactForSorting();
 
     CompareWithCompareFunctionArguments* oldArgs = compareWithCompareFunctionArguments;
@@ -423 +423 @@
 }
 
-unsigned ArrayInstance::pushUndefinedObjectsToEnd(ExecState *exec)
+unsigned ArrayInstance::compactForSorting()
 {
     JSValue *undefined = jsUndefined();
@@ -448 +448 @@
     for (PropertyNameArrayIterator it = sparseProperties.begin(); it != end; ++it) {
         Identifier name = *it;
-        storage[o] = get(exec, name);
-        JSObject::deleteProperty(exec, name);
+        storage[o] = getDirect(name);
+        _prop.remove(name);
         o++;
     }