diff options
| author | Ben Cheng <bccheng@google.com> | 2012-01-18 14:11:18 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-18 14:11:18 -0800 |
| commit | 556904e9451c06355357277aea8031e2a2a92f28 (patch) | |
| tree | 88ae02098b73adec3e18ba98872cd388ba2ecab0 /tests | |
| parent | 3560a2d72e377a36fc0a8ee675b3bf6096dc8f43 (diff) | |
| parent | f36ff048fa354bcc7597a187002728106a8b9346 (diff) | |
| download | android_dalvik-556904e9451c06355357277aea8031e2a2a92f28.tar.gz android_dalvik-556904e9451c06355357277aea8031e2a2a92f28.tar.bz2 android_dalvik-556904e9451c06355357277aea8031e2a2a92f28.zip | |
Merge "Bug fix for control-flow construction involving nested loops."
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/083-jit-regressions/expected.txt | 1 | ||||
| -rw-r--r-- | tests/083-jit-regressions/info.txt | 1 | ||||
| -rw-r--r-- | tests/083-jit-regressions/src/Main.java | 21 |
3 files changed, 23 insertions, 0 deletions
diff --git a/tests/083-jit-regressions/expected.txt b/tests/083-jit-regressions/expected.txt index 1f30d210b..4b9ad5b2d 100644 --- a/tests/083-jit-regressions/expected.txt +++ b/tests/083-jit-regressions/expected.txt @@ -1,3 +1,4 @@ b2296099 passes b2302318 passes b2487514 passes +b5884080 passes diff --git a/tests/083-jit-regressions/info.txt b/tests/083-jit-regressions/info.txt index b791abaa9..00c24ee6f 100644 --- a/tests/083-jit-regressions/info.txt +++ b/tests/083-jit-regressions/info.txt @@ -8,3 +8,4 @@ This test covers JIT regressions 2296099 JIT shift bug 2302318 Crash during spin-on-suspend testing 2487514 Missed exception in PriorityBlockingQueueTest.testToArray1_BadArg +5884080 ICS JIT regression in nested loop formation diff --git a/tests/083-jit-regressions/src/Main.java b/tests/083-jit-regressions/src/Main.java index 1f1dee33d..3b596dbb5 100644 --- a/tests/083-jit-regressions/src/Main.java +++ b/tests/083-jit-regressions/src/Main.java @@ -24,6 +24,7 @@ public class Main { b2296099Test(); b2302318Test(); b2487514Test(); + b5884080Test(); } static void b2296099Test() throws Exception { @@ -105,6 +106,26 @@ public class Main { " (expecting 1000)"); } } + + static void b5884080Test() { + int vA = 1; + + int l = 0; + do + { + int k = 0; + do + vA += 1; + while(++k < 100); + } while(++l < 1000); + if (vA == 100001) { + System.out.println("b5884080 passes"); + } + else { + System.out.println("b5884080 fails: vA is " + vA + + " (expecting 100001)"); + } + } } class SpinThread extends Thread { |