diff options
| -rw-r--r-- | benchmarks/src/benchmarks/DeepArrayOpsBenchmark.java | 10 | ||||
| -rw-r--r-- | ojluni/src/main/java/java/util/Arrays.java | 24 |
2 files changed, 24 insertions, 10 deletions
diff --git a/benchmarks/src/benchmarks/DeepArrayOpsBenchmark.java b/benchmarks/src/benchmarks/DeepArrayOpsBenchmark.java index 624d8234bd..c671da6f41 100644 --- a/benchmarks/src/benchmarks/DeepArrayOpsBenchmark.java +++ b/benchmarks/src/benchmarks/DeepArrayOpsBenchmark.java @@ -30,9 +30,9 @@ public class DeepArrayOpsBenchmark { private Object[] array2; @BeforeExperiment public void setUp() throws Exception { - array = new Object[arrayLength * 13]; - array2 = new Object[arrayLength * 13]; - for (int i = 0; i < arrayLength; i += 13) { + array = new Object[arrayLength * 14]; + array2 = new Object[arrayLength * 14]; + for (int i = 0; i < arrayLength; i += 14) { array[i] = new IntWrapper(i); array2[i] = new IntWrapper(i); @@ -73,6 +73,9 @@ public class DeepArrayOpsBenchmark { // Subarray types is an interface. array[i + 12] = new16ElementArray(CharSequence.class, String.class); array2[i + 12] = new16ElementArray(CharSequence.class, String.class); + + array[i + 13] = null; + array2[i + 13] = null; } } @@ -142,4 +145,3 @@ public class DeepArrayOpsBenchmark { } } } - diff --git a/ojluni/src/main/java/java/util/Arrays.java b/ojluni/src/main/java/java/util/Arrays.java index b9072da352..258ca152bc 100644 --- a/ojluni/src/main/java/java/util/Arrays.java +++ b/ojluni/src/main/java/java/util/Arrays.java @@ -78,7 +78,7 @@ public class Arrays { * tasks that makes parallel speedups unlikely. * @hide */ - // Android-changed: make public (used by harmony ArraysTest) + // Android-changed: Make MIN_ARRAY_SORT_GRAN public and @hide (used by harmony ArraysTest) public static final int MIN_ARRAY_SORT_GRAN = 1 << 13; // Suppresses default constructor, ensuring non-instantiability. @@ -1201,6 +1201,8 @@ public class Arrays { * Sorting of complex type arrays. */ + // Android-removed: LegacyMergeSort class (unused on Android). + /** * Sorts the specified array of objects into ascending order, according * to the {@linkplain Comparable natural ordering} of its elements. @@ -1244,13 +1246,15 @@ public class Arrays { * {@link Comparable} contract */ public static void sort(Object[] a) { - // Android-changed: LegacyMergeSort is no longer supported + // Android-removed: LegacyMergeSort support // if (LegacyMergeSort.userRequested) // legacyMergeSort(a); // else ComparableTimSort.sort(a, 0, a.length, null, 0, 0); } + // Android-removed: legacyMergeSort() (unused on Android) + /** * Sorts the specified range of the specified array of objects into * ascending order, according to the @@ -1305,13 +1309,15 @@ public class Arrays { */ public static void sort(Object[] a, int fromIndex, int toIndex) { rangeCheck(a.length, fromIndex, toIndex); - // Android-changed: LegacyMergeSort is no longer supported + // Android-removed: LegacyMergeSort support // if (LegacyMergeSort.userRequested) // legacyMergeSort(a, fromIndex, toIndex); // else ComparableTimSort.sort(a, fromIndex, toIndex, null, 0, 0); } + // Android-removed: legacyMergeSort() (unused on Android) + /** * Tuning parameter: list size at or below which insertion sort will be * used in preference to mergesort. @@ -1425,7 +1431,7 @@ public class Arrays { if (c == null) { sort(a); } else { - // Android-changed: LegacyMergeSort is no longer supported + // Android-removed: LegacyMergeSort support // if (LegacyMergeSort.userRequested) // legacyMergeSort(a, c); // else @@ -1433,6 +1439,8 @@ public class Arrays { } } + // Android-removed: legacyMergeSort() (unused on Android) + /** * Sorts the specified range of the specified array of objects according * to the order induced by the specified comparator. The range to be @@ -1491,7 +1499,7 @@ public class Arrays { sort(a, fromIndex, toIndex); } else { rangeCheck(a.length, fromIndex, toIndex); - // Android-changed: LegacyMergeSort is no longer supported + // Android-removed: LegacyMergeSort support // if (LegacyMergeSort.userRequested) // legacyMergeSort(a, fromIndex, toIndex, c); // else @@ -1499,6 +1507,9 @@ public class Arrays { } } + // Android-removed: legacyMergeSort() (unused on Android) + // Android-removed: mergeSort() (unused on Android) + // Parallel prefix /** @@ -4113,7 +4124,7 @@ public class Arrays { for (Object element : a) { int elementHash = 0; - // BEGIN Android-changed: getComponentType() is faster than instanceof() + // BEGIN Android-changed: getComponentType() is faster than instanceof if (element != null) { Class<?> cl = element.getClass().getComponentType(); if (cl == null) @@ -4197,6 +4208,7 @@ public class Arrays { if (e1 == e2) continue; // Android-changed: Return early if e2 == null + // if (e1 == null) if (e1 == null || e2 == null) return false; |