More store/allocation elimination for singletons in case of loops
For a store into a singleton's location, if it happens inside a loop, it
means the singleton's location value may be killed by loop side effects.
However if the singleton is defined inside that loop, that loop should
be skipped since its loop side effects kill values at loop header where
the singleton's location doesn't exist yet.
Test: test-art-host
Bug: 31716107
Change-Id: Iae2494ea93295977f90d1463ee136a7e2e09ba9b
diff --git a/test/530-checker-lse/src/Main.java b/test/530-checker-lse/src/Main.java
index 89875d7..6b0dedf 100644
--- a/test/530-checker-lse/src/Main.java
+++ b/test/530-checker-lse/src/Main.java
@@ -717,6 +717,33 @@
return sumWithFilter(array, filter);
}
+ private static int mI = 0;
+ private static float mF = 0f;
+
+ /// CHECK-START: float Main.testAllocationEliminationWithLoops() load_store_elimination (before)
+ /// CHECK: NewInstance
+ /// CHECK: NewInstance
+ /// CHECK: NewInstance
+
+ /// CHECK-START: float Main.testAllocationEliminationWithLoops() load_store_elimination (after)
+ /// CHECK-NOT: NewInstance
+
+ private static float testAllocationEliminationWithLoops() {
+ for (int i0 = 0; i0 < 5; i0++) {
+ for (int i1 = 0; i1 < 5; i1++) {
+ for (int i2 = 0; i2 < 5; i2++) {
+ int lI0 = ((int) new Integer(((int) new Integer(mI))));
+ if (((boolean) new Boolean(false))) {
+ for (int i3 = 576 - 1; i3 >= 0; i3--) {
+ mF -= 976981405.0f;
+ }
+ }
+ }
+ }
+ }
+ return 1.0f;
+ }
+
static void assertIntEquals(int result, int expected) {
if (expected != result) {
throw new Error("Expected: " + expected + ", found: " + result);
@@ -779,6 +806,8 @@
assertIntEquals($noinline$testHSelect(true), 0xdead);
int[] array = {2, 5, 9, -1, -3, 10, 8, 4};
assertIntEquals(sumWithinRange(array, 1, 5), 11);
+ assertFloatEquals(testAllocationEliminationWithLoops(), 1.0f);
+ assertFloatEquals(mF, 0f);
}
static boolean sFlag;