diff options
author | Nicolas Geoffray <ngeoffray@google.com> | 2015-06-20 23:49:01 +0100 |
---|---|---|
committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-06-22 10:09:07 +0100 |
commit | 7d4cc8c786ff4a19234c1b034eae61ac0f3a37da (patch) | |
tree | 2c78a3c37951b0cf663d5c9c22d2fd665a930c55 /test | |
parent | ff82263e2b96ad099c56c19b91c2286baaf82fa7 (diff) | |
download | art-7d4cc8c786ff4a19234c1b034eae61ac0f3a37da.zip art-7d4cc8c786ff4a19234c1b034eae61ac0f3a37da.tar.gz art-7d4cc8c786ff4a19234c1b034eae61ac0f3a37da.tar.bz2 |
Fix wrong DCHECK in bounds check elimination.
The lower range of an array length instruction can
be changed by other instructions than HBoundsCheck,
like HNewArray.
bug:21862741
(cherry picked from commit 8d82a0c2b2b12f259ccb357d3b1e699c68ad0400)
Change-Id: I1bb1a4f4c6673509dd3fb5184c32992bed876250
Diffstat (limited to 'test')
-rw-r--r-- | test/513-array-deopt/expected.txt | 0 | ||||
-rw-r--r-- | test/513-array-deopt/info.txt | 2 | ||||
-rw-r--r-- | test/513-array-deopt/src/Main.java | 37 |
3 files changed, 39 insertions, 0 deletions
diff --git a/test/513-array-deopt/expected.txt b/test/513-array-deopt/expected.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test/513-array-deopt/expected.txt diff --git a/test/513-array-deopt/info.txt b/test/513-array-deopt/info.txt new file mode 100644 index 0000000..afce9d9 --- /dev/null +++ b/test/513-array-deopt/info.txt @@ -0,0 +1,2 @@ +Regression test for the BCE phase of optimizing, +that used to have wrong assumptions about array length bounds. diff --git a/test/513-array-deopt/src/Main.java b/test/513-array-deopt/src/Main.java new file mode 100644 index 0000000..a0ae4c3 --- /dev/null +++ b/test/513-array-deopt/src/Main.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2015 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 int[] bar(int[] a) { + a[0] = 0; + a[1] = 0; + a[2] = 0; + // Up to this point, we record that the lower bound is 2. + // The next instruction will record that the lower bound is 5. + // The deoptimization code used to assume the lower bound has + // to be check it will add for the deoptimization (here, it + // would be 2). + return new int[a.length - 5]; + } + + public static void main(String[] args) { + int[] a = new int[5]; + a = bar(a); + if (a.length != 0) { + throw new Error("Expected 0, got " + a.length); + } + } +} |