From 9f65db89353c46f6b189656f7f55a99054e5cfce Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 7 Jul 2016 12:07:42 +0100 Subject: Fix System.arraycopy when doing same array copying. At compile time, if constant source < constant destination, and we don't know if the arrays are the same, then we must emit code that checks if the two arrays are the same. If so, we jump to the slow path. test:610-arraycopy Change-Id: Ida67993d472b0ba4056d9c21c68f6e5239421f7d --- test/610-arraycopy/src/Main.java | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 test/610-arraycopy/src/Main.java (limited to 'test/610-arraycopy/src/Main.java') diff --git a/test/610-arraycopy/src/Main.java b/test/610-arraycopy/src/Main.java new file mode 100644 index 0000000000..ee11c8ee2a --- /dev/null +++ b/test/610-arraycopy/src/Main.java @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +public class Main { + public static void main(String[] args) { + Object[] a = new Object[5]; + for (int i = 0; i < 5; i++) { + a[i] = new Integer(i); + } + $noinline$callArrayCopy(a, a); + + expectEquals(0, ((Integer)a[0]).intValue()); + expectEquals(0, ((Integer)a[1]).intValue()); + expectEquals(1, ((Integer)a[2]).intValue()); + expectEquals(2, ((Integer)a[3]).intValue()); + expectEquals(4, ((Integer)a[4]).intValue()); + } + + public static void expectEquals(int expected, int actual) { + if (expected != actual) { + throw new Error("Expected " + expected + ", got " + actual); + } + } + + public static void $noinline$callArrayCopy(Object[] a, Object[] b) { + System.arraycopy(a, 0, b, 1, 3); + if (doThrow) { throw new Error(); } + } + + static boolean doThrow = false; +} -- cgit v1.2.3-59-g8ed1b