Reland "BackportedMethods for Android U"
This reverts commit 4c921950dd521be22d536e6029034b523a705ed5.
Change-Id: I104ace44d1a5f29e190175b4abcc609d20f14855
diff --git a/src/test/examplesJava17/backport/MathBackportJava17Main.java b/src/test/examplesJava17/backport/MathBackportJava17Main.java
new file mode 100644
index 0000000..7eeed95
--- /dev/null
+++ b/src/test/examplesJava17/backport/MathBackportJava17Main.java
@@ -0,0 +1,48 @@
+// Copyright (c) 2023, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package backport;
+
+public class MathBackportJava17Main {
+
+ public static void main(String[] args) {
+ // The methods are actually from Java 15, but we can test them from Java 17.
+ testAbsExactInteger();
+ testAbsExactLong();
+ }
+
+ private static void testAbsExactInteger() {
+ assertEquals(42, Math.absExact(42));
+ assertEquals(42, Math.absExact(-42));
+ assertEquals(Integer.MAX_VALUE, Math.absExact(Integer.MAX_VALUE));
+ try {
+ throw new AssertionError(Math.absExact(Integer.MIN_VALUE));
+ } catch (ArithmeticException expected) {
+
+ }
+ }
+
+ private static void testAbsExactLong() {
+ assertEquals(42L, Math.absExact(42L));
+ assertEquals(42L, Math.absExact(-42L));
+ assertEquals(Long.MAX_VALUE, Math.absExact(Long.MAX_VALUE));
+ try {
+ throw new AssertionError(Math.absExact(Long.MIN_VALUE));
+ } catch (ArithmeticException expected) {
+
+ }
+ }
+
+ private static void assertEquals(int expected, int actual) {
+ if (expected != actual) {
+ throw new AssertionError("Expected <" + expected + "> but was <" + actual + '>');
+ }
+ }
+
+ private static void assertEquals(long expected, long actual) {
+ if (expected != actual) {
+ throw new AssertionError("Expected <" + expected + "> but was <" + actual + '>');
+ }
+ }
+}
diff --git a/src/test/examplesJava17/backport/ObjectsBackportJava17Main.java b/src/test/examplesJava17/backport/ObjectsBackportJava17Main.java
new file mode 100644
index 0000000..b950c17
--- /dev/null
+++ b/src/test/examplesJava17/backport/ObjectsBackportJava17Main.java
@@ -0,0 +1,116 @@
+// Copyright (c) 2023, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package backport;
+
+import java.util.Objects;
+
+public class ObjectsBackportJava17Main {
+
+ public static void main(String[] args) {
+ // The methods are actually from Java 16, but we can test them from Java 17.
+ testCheckIndex();
+ testCheckFromToIndex();
+ testCheckFromIndexSize();
+ }
+
+ private static void testCheckIndex() {
+ for (long i = 0L; i < 10L; i++) {
+ assertEquals(i, Objects.checkIndex(i, 10L));
+ }
+
+ try {
+ throw new AssertionError(Objects.checkIndex(-1L, 10L));
+ } catch (IndexOutOfBoundsException expected) {
+ }
+ try {
+ throw new AssertionError(Objects.checkIndex(10L, 0L));
+ } catch (IndexOutOfBoundsException expected) {
+ }
+ try {
+ throw new AssertionError(Objects.checkIndex(0L, 0L));
+ } catch (IndexOutOfBoundsException expected) {
+ }
+ }
+
+ private static void testCheckFromToIndex() {
+ for (long i = 0L; i <= 10L; i++) {
+ for (long j = i; j <= 10L; j++) {
+ assertEquals(i, Objects.checkFromToIndex(i, j, 10L));
+ }
+ }
+ assertEquals(0L, Objects.checkFromToIndex(0L, 0L, 0L));
+
+ try {
+ throw new AssertionError(Objects.checkFromToIndex(4L, 2L, 10L));
+ } catch (IndexOutOfBoundsException expected) {
+ }
+ try {
+ throw new AssertionError(Objects.checkFromToIndex(-1L, 5L, 10L));
+ } catch (IndexOutOfBoundsException expected) {
+ }
+ try {
+ throw new AssertionError(Objects.checkFromToIndex(0L, -1L, 10L));
+ } catch (IndexOutOfBoundsException expected) {
+ }
+ try {
+ throw new AssertionError(Objects.checkFromToIndex(11L, 11L, 10L));
+ } catch (IndexOutOfBoundsException expected) {
+ }
+ try {
+ throw new AssertionError(Objects.checkFromToIndex(0L, 1L, 0L));
+ } catch (IndexOutOfBoundsException expected) {
+ }
+ try {
+ throw new AssertionError(Objects.checkFromToIndex(1L, 1L, 0L));
+ } catch (IndexOutOfBoundsException expected) {
+ }
+ }
+
+ private static void testCheckFromIndexSize() {
+ for (long i = 0L; i <= 10L; i++) {
+ for (long j = 10L - i; j >= 0L; j--) {
+ assertEquals(i, Objects.checkFromIndexSize(i, j, 10L));
+ }
+ }
+ assertEquals(0, Objects.checkFromIndexSize(0L, 0L, 0L));
+
+ try {
+ throw new AssertionError(Objects.checkFromIndexSize(8L, 4L, 10L));
+ } catch (IndexOutOfBoundsException expected) {
+ }
+ try {
+ throw new AssertionError(Objects.checkFromIndexSize(-1L, 5L, 10L));
+ } catch (IndexOutOfBoundsException expected) {
+ }
+ try {
+ throw new AssertionError(Objects.checkFromIndexSize(11L, 0L, 10L));
+ } catch (IndexOutOfBoundsException expected) {
+ }
+ try {
+ throw new AssertionError(Objects.checkFromIndexSize(0L, 1L, 0L));
+ } catch (IndexOutOfBoundsException expected) {
+ }
+ try {
+ throw new AssertionError(Objects.checkFromIndexSize(1L, 1L, 0L));
+ } catch (IndexOutOfBoundsException expected) {
+ }
+
+ // Check for cases where overflow might occur producing incorrect results.
+ try {
+ throw new AssertionError(Objects.checkFromIndexSize(Long.MAX_VALUE, 1L, Long.MAX_VALUE));
+ } catch (IndexOutOfBoundsException expected) {
+ }
+ try {
+ throw new AssertionError(Objects.checkFromIndexSize(0L, 1L, Long.MIN_VALUE));
+ } catch (IndexOutOfBoundsException expected) {
+ }
+ }
+
+ private static void assertEquals(long expected, long actual) {
+ if (expected != actual) {
+ throw new AssertionError("Expected <" + expected + "> but was <" + actual + '>');
+ }
+ }
+}
diff --git a/src/test/examplesJava17/backport/StrictMathBackportJava17Main.java b/src/test/examplesJava17/backport/StrictMathBackportJava17Main.java
new file mode 100644
index 0000000..028e24f
--- /dev/null
+++ b/src/test/examplesJava17/backport/StrictMathBackportJava17Main.java
@@ -0,0 +1,119 @@
+// Copyright (c) 2023, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package backport;
+
+public class StrictMathBackportJava17Main {
+
+ public static void main(String[] args) {
+ // The methods are actually from Java 15, but we can test them from Java 17.
+ testAbsExactInteger();
+ testAbsExactLong();
+ // The methods are actually from Java 14, but we can test them from Java 17.
+ testDecrementExactInteger();
+ testDecrementExactLong();
+ testIncrementExactInteger();
+ testIncrementExactLong();
+ testNegateExactInteger();
+ testNegateExactLong();
+ }
+
+ private static void testAbsExactInteger() {
+ assertEquals(42, StrictMath.absExact(42));
+ assertEquals(42, StrictMath.absExact(-42));
+ assertEquals(Integer.MAX_VALUE, StrictMath.absExact(Integer.MAX_VALUE));
+ try {
+ throw new AssertionError(StrictMath.absExact(Integer.MIN_VALUE));
+ } catch (ArithmeticException expected) {
+
+ }
+ }
+
+ private static void testAbsExactLong() {
+ assertEquals(42L, StrictMath.absExact(42L));
+ assertEquals(42L, StrictMath.absExact(-42L));
+ assertEquals(Long.MAX_VALUE, StrictMath.absExact(Long.MAX_VALUE));
+ try {
+ throw new AssertionError(StrictMath.absExact(Long.MIN_VALUE));
+ } catch (ArithmeticException expected) {
+
+ }
+ }
+
+ private static void testDecrementExactInteger() {
+ assertEquals(-1, StrictMath.decrementExact(0));
+ assertEquals(Integer.MIN_VALUE, StrictMath.decrementExact(Integer.MIN_VALUE + 1));
+
+ try {
+ throw new AssertionError(StrictMath.decrementExact(Integer.MIN_VALUE));
+ } catch (ArithmeticException expected) {
+ }
+ }
+
+ private static void testDecrementExactLong() {
+ assertEquals(-1L, StrictMath.decrementExact(0L));
+ assertEquals(Long.MIN_VALUE, StrictMath.decrementExact(Long.MIN_VALUE + 1L));
+
+ try {
+ throw new AssertionError(StrictMath.decrementExact(Long.MIN_VALUE));
+ } catch (ArithmeticException expected) {
+ }
+ }
+
+ private static void testIncrementExactInteger() {
+ assertEquals(1, StrictMath.incrementExact(0));
+ assertEquals(Integer.MAX_VALUE, StrictMath.incrementExact(Integer.MAX_VALUE - 1));
+
+ try {
+ throw new AssertionError(StrictMath.incrementExact(Integer.MAX_VALUE));
+ } catch (ArithmeticException expected) {
+ }
+ }
+
+ private static void testIncrementExactLong() {
+ assertEquals(1L, StrictMath.incrementExact(0L));
+ assertEquals(Long.MAX_VALUE, StrictMath.incrementExact(Long.MAX_VALUE - 1L));
+
+ try {
+ throw new AssertionError(StrictMath.incrementExact(Long.MAX_VALUE));
+ } catch (ArithmeticException expected) {
+ }
+ }
+
+ private static void testNegateExactInteger() {
+ assertEquals(0, StrictMath.negateExact(0));
+ assertEquals(-1, StrictMath.negateExact(1));
+ assertEquals(1, StrictMath.negateExact(-1));
+ assertEquals(-2_147_483_647, StrictMath.negateExact(Integer.MAX_VALUE));
+
+ try {
+ throw new AssertionError(StrictMath.negateExact(Integer.MIN_VALUE));
+ } catch (ArithmeticException expected) {
+ }
+ }
+
+ private static void testNegateExactLong() {
+ assertEquals(0L, StrictMath.negateExact(0L));
+ assertEquals(-1L, StrictMath.negateExact(1L));
+ assertEquals(1L, StrictMath.negateExact(-1L));
+ assertEquals(-9_223_372_036_854_775_807L, StrictMath.negateExact(Long.MAX_VALUE));
+
+ try {
+ throw new AssertionError(StrictMath.negateExact(Long.MIN_VALUE));
+ } catch (ArithmeticException expected) {
+ }
+ }
+
+ private static void assertEquals(int expected, int actual) {
+ if (expected != actual) {
+ throw new AssertionError("Expected <" + expected + "> but was <" + actual + '>');
+ }
+ }
+
+ private static void assertEquals(long expected, long actual) {
+ if (expected != actual) {
+ throw new AssertionError("Expected <" + expected + "> but was <" + actual + '>');
+ }
+ }
+}
