*** old/test/compiler/stable/TestStableObject.java	Mon Feb 29 15:42:37 2016
--- new/test/compiler/stable/TestStableObject.java	Mon Feb 29 15:42:37 2016

*** 87,97 ****
--- 87,96 ----
  
  import java.lang.reflect.InvocationTargetException;
  
  public class TestStableObject {
      static final boolean isStableEnabled    = StableConfiguration.isStableEnabled;
      static final boolean isServerWithStable = StableConfiguration.isServerWithStable;
  
      public static void main(String[] args) throws Exception {
          run(DefaultValue.class);
          run(ObjectStable.class);
          run(DefaultStaticValue.class);

*** 210,234 ****
--- 209,233 ----
          public static void test() throws Exception {
              {
                  c.v = new Object[1]; c.v[0] = Values.A; Object val1 = get();
                                       c.v[0] = Values.B; Object val2 = get();
                  assertEquals(val1, Values.A);
!                 assertEquals(val2, (isServerWithStable ? Values.A : Values.B));
!                 assertEquals(val2, (isStableEnabled ? Values.A : Values.B));
  
                  c.v = new Object[1]; c.v[0] = Values.C; Object val3 = get();
!                 assertEquals(val3, (isStableEnabled ? (isServerWithStable ? Values.A : Values.B)
!                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
                                                      : Values.C));
              }
  
              {
                  c.v = new Object[20]; c.v[10] = Values.A; Object val1 = get1();
                                        c.v[10] = Values.B; Object val2 = get1();
                  assertEquals(val1, Values.A);
!                 assertEquals(val2, (isServerWithStable ? Values.A : Values.B));
!                 assertEquals(val2, (isStableEnabled ? Values.A : Values.B));
  
                  c.v = new Object[20]; c.v[10] = Values.C; Object val3 = get1();
!                 assertEquals(val3, (isStableEnabled ? (isServerWithStable ? Values.A : Values.B)
!                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
                                                      : Values.C));
              }
  
              {
                  c.v = new Object[1]; Object[] val1 = get2();

*** 250,274 ****
--- 249,273 ----
          public static void test() throws Exception {
              {
                  c.v = new Object[1][1]; c.v[0][0] = Values.A; Object val1 = get();
                                          c.v[0][0] = Values.B; Object val2 = get();
                  assertEquals(val1, Values.A);
!                 assertEquals(val2, (isServerWithStable ? Values.A : Values.B));
!                 assertEquals(val2, (isStableEnabled ? Values.A : Values.B));
  
                  c.v = new Object[1][1]; c.v[0][0] = Values.C; Object val3 = get();
!                 assertEquals(val3, (isStableEnabled ? (isServerWithStable ? Values.A : Values.B)
!                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
                                                      : Values.C));
  
                  c.v[0] = new Object[1]; c.v[0][0] = Values.D; Object val4 = get();
!                 assertEquals(val4, (isStableEnabled ? (isServerWithStable ? Values.A : Values.B)
!                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
                                                      : Values.D));
              }
  
              {
                  c.v = new Object[1][1]; Object[] val1 = get1();
                  c.v[0] = new Object[1]; Object[] val2 = get1();
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new Object[1][1]; Object[][] val1 = get2();
                  c.v = new Object[1][1]; Object[][] val2 = get2();

*** 290,324 ****
--- 289,323 ----
          public static void test() throws Exception {
              {
                  c.v = new Object[1][1][1]; c.v[0][0][0] = Values.A; Object val1 = get();
                                             c.v[0][0][0] = Values.B; Object val2 = get();
                  assertEquals(val1, Values.A);
!                 assertEquals(val2, (isServerWithStable ? Values.A : Values.B));
!                 assertEquals(val2, (isStableEnabled ? Values.A : Values.B));
  
                  c.v = new Object[1][1][1]; c.v[0][0][0] = Values.C; Object val3 = get();
!                 assertEquals(val3, (isStableEnabled ? (isServerWithStable ? Values.A : Values.B)
!                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
                                                      : Values.C));
  
                  c.v[0] = new Object[1][1]; c.v[0][0][0] = Values.D; Object val4 = get();
!                 assertEquals(val4, (isStableEnabled ? (isServerWithStable ? Values.A : Values.B)
!                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
                                                      : Values.D));
  
                  c.v[0][0] = new Object[1]; c.v[0][0][0] = Values.E; Object val5 = get();
!                 assertEquals(val5, (isStableEnabled ? (isServerWithStable ? Values.A : Values.B)
!                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
                                                      : Values.E));
              }
  
              {
                  c.v = new Object[1][1][1]; Object[] val1 = get1();
                  c.v[0][0] = new Object[1]; Object[] val2 = get1();
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new Object[1][1][1]; Object[][] val1 = get2();
                  c.v[0] = new Object[1][1]; Object[][] val2 = get2();
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new Object[1][1][1]; Object[][][] val1 = get3();
                  c.v = new Object[1][1][1]; Object[][][] val2 = get3();

*** 341,385 ****
--- 340,384 ----
          public static void test() throws Exception {
              {
                  c.v = new Object[1][1][1][1]; c.v[0][0][0][0] = Values.A; Object val1 = get();
                                                c.v[0][0][0][0] = Values.B; Object val2 = get();
                  assertEquals(val1, Values.A);
!                 assertEquals(val2, (isServerWithStable ? Values.A : Values.B));
!                 assertEquals(val2, (isStableEnabled ? Values.A : Values.B));
  
                  c.v = new Object[1][1][1][1]; c.v[0][0][0][0] = Values.C; Object val3 = get();
!                 assertEquals(val3, (isStableEnabled ? (isServerWithStable ? Values.A : Values.B)
!                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
                                                      : Values.C));
  
                  c.v[0] = new Object[1][1][1]; c.v[0][0][0][0] = Values.D; Object val4 = get();
!                 assertEquals(val4, (isStableEnabled ? (isServerWithStable ? Values.A : Values.B)
!                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
                                                      : Values.D));
  
                  c.v[0][0] = new Object[1][1]; c.v[0][0][0][0] = Values.E; Object val5 = get();
!                 assertEquals(val5, (isStableEnabled ? (isServerWithStable ? Values.A : Values.B)
!                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
                                                      : Values.E));
  
                  c.v[0][0][0] = new Object[1]; c.v[0][0][0][0] = Values.F; Object val6 = get();
!                 assertEquals(val6, (isStableEnabled ? (isServerWithStable ? Values.A : Values.B)
!                 assertEquals(val6, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
                                                      : Values.F));
              }
  
              {
                  c.v = new Object[1][1][1][1]; Object[] val1 = get1();
                  c.v[0][0][0] = new Object[1]; Object[] val2 = get1();
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new Object[1][1][1][1]; Object[][] val1 = get2();
                  c.v[0][0] = new Object[1][1]; Object[][] val2 = get2();
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new Object[1][1][1][1]; Object[][][] val1 = get3();
                  c.v[0] = new Object[1][1][1]; Object[][][] val2 = get3();
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new Object[1][1][1][1]; Object[][][][] val1 = get4();
                  c.v = new Object[1][1][1][1]; Object[][][][] val2 = get4();

*** 435,445 ****
--- 434,444 ----
  
              {
                  c.v = new Object[1][1]; c.v[0] = new Object[0]; Object[] val1 = get1();
                                       c.v[0] = new Object[0]; Object[] val2 = get1();
  
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new Object[0][0]; Object[] val1 = get2();
                  c.v = new Object[0][0]; Object[] val2 = get2();

*** 471,488 ****
--- 470,487 ----
  
              {
                  c.v = new Object[1][1][1]; c.v[0][0] = new Object[0]; Object[] val1 = get1();
                                             c.v[0][0] = new Object[0]; Object[] val2 = get1();
  
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new Object[1][1][1]; c.v[0] = new Object[0][0]; Object[][] val1 = get2();
                                             c.v[0] = new Object[0][0]; Object[][] val2 = get2();
  
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new Object[0][0][0]; Object[][] val1 = get3();
                  c.v = new Object[0][0][0]; Object[][] val2 = get3();

*** 613,623 ****
--- 612,622 ----
                  c.v = new A[] { elem, elem }; c.v[0].left = c.v[0].right = c.v;
                                 elem.a = Values.A; Object val1 = get(); Object val2 = get1();
                                 elem.a = Values.B; Object val3 = get(); Object val4 = get1();
  
                  assertEquals(val1, Values.A);
!                 assertEquals(val3, (isServerWithStable ? Values.A : Values.B));
!                 assertEquals(val3, (isStableEnabled ? Values.A : Values.B));
  
                  assertEquals(val2, Values.A);
                  assertEquals(val4, Values.B);
              }
          }