diff options
author | Nicolas Geoffray <ngeoffray@google.com> | 2014-11-12 17:50:07 +0000 |
---|---|---|
committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-11-12 17:55:24 +0000 |
commit | f0e3937b87453234d0d7970b8712082062709b8d (patch) | |
tree | e552c1173ee90fea1d2ba11cc08878efe65ba0be /test/427-bounds | |
parent | 59321e0e10ea09694efecf6154704e2743b9bffd (diff) | |
download | art-f0e3937b87453234d0d7970b8712082062709b8d.zip art-f0e3937b87453234d0d7970b8712082062709b8d.tar.gz art-f0e3937b87453234d0d7970b8712082062709b8d.tar.bz2 |
Do a parallel move in BoundsCheckSlowPath.
The two locations of the index and length could overlap,
so we need a parallel move. Also factorize the code for
doing a parallel move based on two locations.
Change-Id: Iee8b3459e2eed6704d45e9a564fb2cd050741ea4
Diffstat (limited to 'test/427-bounds')
-rw-r--r-- | test/427-bounds/expected.txt | 0 | ||||
-rw-r--r-- | test/427-bounds/info.txt | 2 | ||||
-rw-r--r-- | test/427-bounds/src/Main.java | 51 |
3 files changed, 53 insertions, 0 deletions
diff --git a/test/427-bounds/expected.txt b/test/427-bounds/expected.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test/427-bounds/expected.txt diff --git a/test/427-bounds/info.txt b/test/427-bounds/info.txt new file mode 100644 index 0000000..8b8b957 --- /dev/null +++ b/test/427-bounds/info.txt @@ -0,0 +1,2 @@ +Regression test for the optimizing compiler that used to incorrectly pass +index and/or length to the pThrowArrayBounds entrypoint. diff --git a/test/427-bounds/src/Main.java b/test/427-bounds/src/Main.java new file mode 100644 index 0000000..a2d84d2 --- /dev/null +++ b/test/427-bounds/src/Main.java @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2014 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) { + Exception exception = null; + try { + $opt$Throw(new int[1]); + } catch (ArrayIndexOutOfBoundsException e) { + exception = e; + } + + String exceptionMessage = exception.getMessage(); + + // Note that it's ART specific to emit the length. + if (exceptionMessage.contains("length")) { + if (!exceptionMessage.contains("length=1")) { + throw new Error("Wrong length in exception message"); + } + } + + // Note that it's ART specific to emit the index. + if (exceptionMessage.contains("index")) { + if (!exceptionMessage.contains("index=2")) { + throw new Error("Wrong index in exception message"); + } + } + } + + static void $opt$Throw(int[] array) { + // We fetch the length first, to ensure it is in EAX (on x86). + // The pThrowArrayBounds entrypoint expects the index in EAX and the + // length in ECX, and the optimizing compiler used to write to EAX + // before putting the length in ECX. + int length = array.length; + array[2] = 42; + } +} |