diff options
author | Nicolas Geoffray <ngeoffray@google.com> | 2015-06-24 14:57:44 +0100 |
---|---|---|
committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-06-24 16:56:06 +0100 |
commit | b5171ff4859104a1e314c3091b6bd4872ad7c2b2 (patch) | |
tree | 1a553e9f48f481d4f0d9140d3d14547b4b0f8c73 /test | |
parent | 0fd292ddd463f1acf26b2b17d34d9b5a4ba93985 (diff) | |
download | art-b5171ff4859104a1e314c3091b6bd4872ad7c2b2.zip art-b5171ff4859104a1e314c3091b6bd4872ad7c2b2.tar.gz art-b5171ff4859104a1e314c3091b6bd4872ad7c2b2.tar.bz2 |
BCE: don't assume a bounds check always gets a HArrayLength.
Deoptimizations may change it to a HPhi.
bug:22056703
(cherry picked from commit 8df886b9214802ad689316a1dedb00a6d102555c)
Change-Id: I8afcf88e3a12dbe4d87101e6a7cefb8b81e2bb96
Diffstat (limited to 'test')
-rw-r--r-- | test/499-bce-phi-array-length/src/Main.java | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/test/499-bce-phi-array-length/src/Main.java b/test/499-bce-phi-array-length/src/Main.java index c8c84a1..e917bc1 100644 --- a/test/499-bce-phi-array-length/src/Main.java +++ b/test/499-bce-phi-array-length/src/Main.java @@ -32,11 +32,33 @@ public class Main { return result; } + public static int bar(int start, int[] array) { + int result = 0; + for (int i = start; i < 3; i++) { + result += array[i]; + for (int j = 0; j < 2; ++j) { + result += array[j]; + // The following operations would lead to BCE wanting to add another + // deoptimization, but it crashed assuming the input of a `HBoundsCheck` + // must be a `HArrayLength`. + result += array[0]; + result += array[1]; + result += array[2]; + } + } + return result; + } + public static void main(String[] args) { int[] a = new int[] { 1, 2, 3, 4, 5 }; int result = foo(1, a); if (result != 11) { throw new Error("Got " + result + ", expected " + 11); } + + result = bar(1, a); + if (result != 35) { + throw new Error("Got " + result + ", expected " + 35); + } } } |