--- old/test/compiler/stable/TestStableBoolean.java 2016-05-31 19:42:28.000000000 +0300 +++ new/test/compiler/stable/TestStableBoolean.java 2016-05-31 19:42:28.000000000 +0300 @@ -95,13 +95,12 @@ /* ==================================================== */ static class DefaultValue { - public @Stable - boolean v; + public @Stable boolean v; public static final DefaultValue c = new DefaultValue(); public static boolean get() { return c.v; } public static void test() throws Exception { - boolean val1 = get(); + boolean val1 = get(); c.v = true; boolean val2 = get(); assertEquals(val1, false); assertEquals(val2, true); @@ -131,7 +130,7 @@ public static final DefaultStaticValue c = new DefaultStaticValue(); public static boolean get() { return c.v; } public static void test() throws Exception { - boolean val1 = get(); + boolean val1 = get(); c.v = true; boolean val2 = get(); assertEquals(val1, false); assertEquals(val2, true); @@ -181,14 +180,14 @@ public static void test() throws Exception { { c.v = new boolean[1]; c.v[0] = true; boolean val1 = get(); - c.v[0] = false; boolean val2 = get(); + c.v[0] = false; boolean val2 = get(); assertEquals(val1, true); assertEquals(val2, (isStableEnabled ? true : false)); } { c.v = new boolean[20]; c.v[10] = true; boolean val1 = get1(); - c.v[10] = false; boolean val2 = get1(); + c.v[10] = false; boolean val2 = get1(); assertEquals(val1, true); assertEquals(val2, (isStableEnabled ? true : false)); } @@ -213,7 +212,7 @@ public static void test() throws Exception { { c.v = new boolean[1][1]; c.v[0][0] = true; boolean val1 = get(); - c.v[0][0] = false; boolean val2 = get(); + c.v[0][0] = false; boolean val2 = get(); assertEquals(val1, true); assertEquals(val2, (isStableEnabled ? true : false)); @@ -251,7 +250,7 @@ public static void test() throws Exception { { c.v = new boolean[1][1][1]; c.v[0][0][0] = true; boolean val1 = get(); - c.v[0][0][0] = false; boolean val2 = get(); + c.v[0][0][0] = false; boolean val2 = get(); assertEquals(val1, true); assertEquals(val2, (isStableEnabled ? true : false)); @@ -299,7 +298,7 @@ public static void test() throws Exception { { c.v = new boolean[1][1][1][1]; c.v[0][0][0][0] = true; boolean val1 = get(); - c.v[0][0][0][0] = false; boolean val2 = get(); + c.v[0][0][0][0] = false; boolean val2 = get(); assertEquals(val1, true); assertEquals(val2, (isStableEnabled ? true : false)); @@ -357,7 +356,7 @@ public static void test() throws Exception { { c.v = new boolean[1]; ((boolean[])c.v)[0] = true; boolean val1 = get(); - ((boolean[])c.v)[0] = false; boolean val2 = get(); + ((boolean[])c.v)[0] = false; boolean val2 = get(); assertEquals(val1, true); assertEquals(val2, false); @@ -384,7 +383,7 @@ public static void test() throws Exception { { c.v = new boolean[1][1]; ((boolean[][])c.v)[0][0] = true; boolean val1 = get(); - ((boolean[][])c.v)[0][0] = false; boolean val2 = get(); + ((boolean[][])c.v)[0][0] = false; boolean val2 = get(); assertEquals(val1, true); assertEquals(val2, false); @@ -392,7 +391,7 @@ { c.v = new boolean[1][1]; c.v[0] = new boolean[0]; boolean[] val1 = get1(); - c.v[0] = new boolean[0]; boolean[] val2 = get1(); + c.v[0] = new boolean[0]; boolean[] val2 = get1(); assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2))); } @@ -420,7 +419,7 @@ public static void test() throws Exception { { c.v = new boolean[1][1][1]; ((boolean[][][])c.v)[0][0][0] = true; boolean val1 = get(); - ((boolean[][][])c.v)[0][0][0] = false; boolean val2 = get(); + ((boolean[][][])c.v)[0][0][0] = false; boolean val2 = get(); assertEquals(val1, true); assertEquals(val2, false); @@ -428,14 +427,14 @@ { c.v = new boolean[1][1][1]; c.v[0][0] = new boolean[0]; boolean[] val1 = get1(); - c.v[0][0] = new boolean[0]; boolean[] val2 = get1(); + c.v[0][0] = new boolean[0]; boolean[] val2 = get1(); assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2))); } { c.v = new boolean[1][1][1]; c.v[0] = new boolean[0][0]; boolean[][] val1 = get2(); - c.v[0] = new boolean[0][0]; boolean[][] val2 = get2(); + c.v[0] = new boolean[0][0]; boolean[][] val2 = get2(); assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2))); } @@ -465,7 +464,7 @@ public static void test() throws Exception { { c.v = new A(); c.v.a = true; A val1 = get(); - c.v.a = false; A val2 = get(); + c.v.a = false; A val2 = get(); assertEquals(val1.a, false); assertEquals(val2.a, false); @@ -473,7 +472,7 @@ { c.v = new A(); c.v.a = true; boolean val1 = get1(); - c.v.a = false; boolean val2 = get1(); + c.v.a = false; boolean val2 = get1(); c.v = new A(); c.v.a = false; boolean val3 = get1(); assertEquals(val1, true); @@ -499,8 +498,8 @@ public static void test() throws Exception { { c.v = new A(); c.v.next = new A(); c.v.next.next = c.v; - c.v.a = true; c.v.next.a = true; A val1 = get(); - c.v.a = false; c.v.next.a = false; A val2 = get(); + c.v.a = true; c.v.next.a = true; A val1 = get(); + c.v.a = false; c.v.next.a = false; A val2 = get(); assertEquals(val1.a, false); assertEquals(val2.a, false); @@ -508,10 +507,10 @@ { c.v = new A(); c.v.next = c.v; - c.v.a = true; boolean val1 = get1(); - c.v.a = false; boolean val2 = get1(); + c.v.a = true; boolean val1 = get1(); + c.v.a = false; boolean val2 = get1(); c.v = new A(); c.v.next = c.v; - c.v.a = false; boolean val3 = get1(); + c.v.a = false; boolean val3 = get1(); assertEquals(val1, true); assertEquals(val2, (isStableEnabled ? true : false)); @@ -537,8 +536,8 @@ public static void test() throws Exception { { c.v = new A(); c.v.left = c.v.right = c.v; - c.v.a = true; boolean val1 = get(); boolean val2 = get1(); - c.v.a = false; boolean val3 = get(); boolean val4 = get1(); + c.v.a = true; boolean val1 = get(); boolean val2 = get1(); + c.v.a = false; boolean val3 = get(); boolean val4 = get1(); assertEquals(val1, true); assertEquals(val3, (isStableEnabled ? true : false)); @@ -568,8 +567,8 @@ { A elem = new A(); c.v = new A[] { elem, elem }; c.v[0].left = c.v[0].right = c.v; - elem.a = true; boolean val1 = get(); boolean val2 = get1(); - elem.a = false; boolean val3 = get(); boolean val4 = get1(); + elem.a = true; boolean val1 = get(); boolean val2 = get1(); + elem.a = false; boolean val3 = get(); boolean val4 = get1(); assertEquals(val1, true); assertEquals(val3, (isStableEnabled ? true : false)); @@ -606,5 +605,4 @@ } } } - }