Make Array.prototype.sort stable

HtmlUnit · Jul 17, 2024 · caff4d9 · caff4d9
1 parent 5bdd291
commit caff4d9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 327 deletions.
diff --git a/rhino/src/main/java/org/mozilla/javascript/NativeArray.java b/rhino/src/main/java/org/mozilla/javascript/NativeArray.java
@@ -1349,7 +1349,8 @@ public int compare(final Object x, final Object y) {
             working[i] = getRawElem(o, i);
         }
 
-        Sorting.get().hybridSort(working, comparator);
+        // 'Arrays.sort' is guaranteed to be stable.
+        Arrays.sort(working, comparator);
 
         // copy the working array back into thisObj
         for (int i = 0; i < length; ++i) {

diff --git a/rhino/src/main/java/org/mozilla/javascript/Sorting.java b/rhino/src/main/java/org/mozilla/javascript/Sorting.java
diff --git a/rhino/src/test/java/org/mozilla/javascript/tests/SortingTest.java b/rhino/src/test/java/org/mozilla/javascript/tests/SortingTest.java
diff --git a/tests/testsrc/test262.properties b/tests/testsrc/test262.properties
@@ -117,8 +117,6 @@ built-ins/Array 146/2670 (5.47%)
     prototype/slice/target-array-with-non-configurable-property.js
     prototype/some/15.4.4.17-5-1-s.js non-strict
     prototype/sort/S15.4.4.11_A8.js non-strict
-    prototype/sort/stability-2048-elements.js
-    prototype/sort/stability-513-elements.js
     prototype/splice/clamps-length-to-integer-limit.js
     prototype/splice/create-ctor-non-object.js
     prototype/splice/create-ctor-poisoned.js