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

Timestamp:

Feb 6, 2008, 9:40:16 AM (17 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

Reviewed by Sam.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17094 Array.prototype functions create length properties with DontEnum/DontDelete

Test results match Gecko with very few obscure exceptions that seem to be
bugs in Gecko.

Test: fast/js/array-functions-non-arrays.html

• kjs/array_object.cpp: (KJS::arrayProtoFuncConcat): Removed DontEnum and DontDelete from the call to set length. (KJS::arrayProtoFuncPop): Ditto. Also added missing call to deleteProperty, which is not needed for real arrays, but is needed for non-arrays. (KJS::arrayProtoFuncPush): Ditto. (KJS::arrayProtoFuncShift): Ditto. (KJS::arrayProtoFuncSlice): Ditto. (KJS::arrayProtoFuncSort): Removed incorrect call to set length when the array has no elements. (KJS::arrayProtoFuncSplice): Removed DontEnum and DontDelete from the call to set length. (KJS::arrayProtoFuncUnShift): Ditto. Also added a check for 0 arguments to make behavior match the specification in that case.
• kjs/nodes.cpp: (KJS::ArrayNode::evaluate): Removed DontEnum and DontDelete from the call to set length.

LayoutTests:

Reviewed by Sam.

• tests for ​http://bugs.webkit.org/show_bug.cgi?id=17094 Array.prototype functions create length attributes with DontEnum/DontDelete

• fast/js/array-functions-non-arrays-expected.txt: Added.
• fast/js/array-functions-non-arrays.html: Added.
• fast/js/resources/array-functions-non-arrays.js: Added.

File:

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

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -249 +249 @@
         ++it;
     }
-    arr->put(exec, exec->propertyNames().length, jsNumber(n), DontEnum | DontDelete);
+    arr->put(exec, exec->propertyNames().length, jsNumber(n));
     return arr;
 }
@@ -258 +258 @@
     unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
     if (length == 0) {
-        thisObj->put(exec, exec->propertyNames().length, jsNumber(length), DontEnum | DontDelete);
+        thisObj->put(exec, exec->propertyNames().length, jsNumber(length));
         result = jsUndefined();
     } else {
         result = thisObj->get(exec, length - 1);
-        thisObj->put(exec, exec->propertyNames().length, jsNumber(length - 1), DontEnum | DontDelete);
+        thisObj->deleteProperty(exec, length - 1);
+        thisObj->put(exec, exec->propertyNames().length, jsNumber(length - 1));
     }
     return result;
@@ -273 +274 @@
         thisObj->put(exec, length + n, args[n]);
     length += args.size();
-    thisObj->put(exec, exec->propertyNames().length, jsNumber(length), DontEnum | DontDelete);
+    thisObj->put(exec, exec->propertyNames().length, jsNumber(length));
     return jsNumber(length);
 }
@@ -306 +307 @@
     unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
     if (length == 0) {
-        thisObj->put(exec, exec->propertyNames().length, jsNumber(length), DontEnum | DontDelete);
+        thisObj->put(exec, exec->propertyNames().length, jsNumber(length));
         result = jsUndefined();
     } else {
@@ -317 +318 @@
         }
         thisObj->deleteProperty(exec, length - 1);
-        thisObj->put(exec, exec->propertyNames().length, jsNumber(length - 1), DontEnum | DontDelete);
+        thisObj->put(exec, exec->propertyNames().length, jsNumber(length - 1));
     }
     return result;
@@ -361 +362 @@
             resObj->put(exec, n, v);
     }
-    resObj->put(exec, exec->propertyNames().length, jsNumber(n), DontEnum | DontDelete);
+    resObj->put(exec, exec->propertyNames().length, jsNumber(n));
     return result;
 }
@@ -384 +385 @@
     unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
 
-    if (!length) {
-        thisObj->put(exec, exec->propertyNames().length, jsNumber(0), DontEnum | DontDelete);
+    if (!length)
         return thisObj;
-    }
 
     // "Min" sort. Not the fastest, but definitely less code than heapsort
     // or quicksort, and much less swapping than bubblesort/insertionsort.
-    for (unsigned i = 0 ; i < length - 1 ; ++i) {
+    for (unsigned i = 0; i < length - 1; ++i) {
         JSValue* iObj = thisObj->get(exec, i);
         unsigned themin = i;
         JSValue* minObj = iObj;
-        for (unsigned j = i + 1 ; j < length ; ++j) {
+        for (unsigned j = i + 1; j < length; ++j) {
             JSValue* jObj = thisObj->get(exec, j);
             double compareResult;
@@ -448 +447 @@
             resObj->put(exec, k, v);
     }
-    resObj->put(exec, exec->propertyNames().length, jsNumber(deleteCount), DontEnum | DontDelete);
+    resObj->put(exec, exec->propertyNames().length, jsNumber(deleteCount));
 
     unsigned additionalArgs = std::max<int>(args.size() - 2, 0);
@@ -459 +458 @@
                     thisObj->deleteProperty(exec, k + additionalArgs);
             }
-            for (unsigned k = length ; k > length - deleteCount + additionalArgs; --k)
+            for (unsigned k = length; k > length - deleteCount + additionalArgs; --k)
                 thisObj->deleteProperty(exec, k - 1);
         } else {
@@ -473 +472 @@
         thisObj->put(exec, k + begin, args[k + 2]);
 
-    thisObj->put(exec, exec->propertyNames().length, jsNumber(length - deleteCount + additionalArgs), DontEnum | DontDelete);
+    thisObj->put(exec, exec->propertyNames().length, jsNumber(length - deleteCount + additionalArgs));
     return result;
 }
@@ -482 +481 @@
     unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
     unsigned nrArgs = args.size();
-    for (unsigned k = length; k > 0; --k) {
-        if (JSValue* v = getProperty(exec, thisObj, k - 1))
-            thisObj->put(exec, k + nrArgs-1, v);
-        else
-            thisObj->deleteProperty(exec, k + nrArgs-1);
+    if (nrArgs) {
+        for (unsigned k = length; k > 0; --k) {
+            if (JSValue* v = getProperty(exec, thisObj, k - 1))
+                thisObj->put(exec, k + nrArgs - 1, v);
+            else
+                thisObj->deleteProperty(exec, k + nrArgs - 1);
+        }
     }
     for (unsigned k = 0; k < nrArgs; ++k)
         thisObj->put(exec, k, args[k]);
     JSValue* result = jsNumber(length + nrArgs);
-    thisObj->put(exec, exec->propertyNames().length, result, DontEnum | DontDelete);
+    thisObj->put(exec, exec->propertyNames().length, result);
     return result;
 }