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

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

*** 207,231 ****
--- 206,230 ----
          public static void test() throws Exception {
              {
                  c.v = new long[1]; c.v[0] = 1; long val1 = get();
                                     c.v[0] = 2; long val2 = get();
                  assertEquals(val1, 1);
!                 assertEquals(val2, (isServerWithStable ? 1 : 2));
!                 assertEquals(val2, (isStableEnabled ? 1 : 2));
  
                  c.v = new long[1]; c.v[0] = 3; long val3 = get();
!                 assertEquals(val3, (isStableEnabled ? (isServerWithStable ? 1 : 2)
!                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
                                                      : 3));
              }
  
              {
                  c.v = new long[20]; c.v[10] = 1; long val1 = get1();
                                      c.v[10] = 2; long val2 = get1();
                  assertEquals(val1, 1);
!                 assertEquals(val2, (isServerWithStable ? 1 : 2));
!                 assertEquals(val2, (isStableEnabled ? 1 : 2));
  
                  c.v = new long[20]; c.v[10] = 3; long val3 = get1();
!                 assertEquals(val3, (isStableEnabled ? (isServerWithStable ? 1 : 2)
!                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
                                                      : 3));
              }
  
              {
                  c.v = new long[1]; long[] val1 = get2();

*** 247,271 ****
--- 246,270 ----
          public static void test() throws Exception {
              {
                  c.v = new long[1][1]; c.v[0][0] = 1; long val1 = get();
                                        c.v[0][0] = 2; long val2 = get();
                  assertEquals(val1, 1);
!                 assertEquals(val2, (isServerWithStable ? 1 : 2));
!                 assertEquals(val2, (isStableEnabled ? 1 : 2));
  
                  c.v = new long[1][1]; c.v[0][0] = 3; long val3 = get();
!                 assertEquals(val3, (isStableEnabled ? (isServerWithStable ? 1 : 2)
!                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
                                                      : 3));
  
                  c.v[0] = new long[1]; c.v[0][0] = 4; long val4 = get();
!                 assertEquals(val4, (isStableEnabled ? (isServerWithStable ? 1 : 2)
!                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
                                                      : 4));
              }
  
              {
                  c.v = new long[1][1]; long[] val1 = get1();
                  c.v[0] = new long[1]; long[] val2 = get1();
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new long[1][1]; long[][] val1 = get2();
                  c.v = new long[1][1]; long[][] val2 = get2();

*** 287,321 ****
--- 286,320 ----
          public static void test() throws Exception {
              {
                  c.v = new long[1][1][1]; c.v[0][0][0] = 1; long val1 = get();
                                           c.v[0][0][0] = 2; long val2 = get();
                  assertEquals(val1, 1);
!                 assertEquals(val2, (isServerWithStable ? 1 : 2));
!                 assertEquals(val2, (isStableEnabled ? 1 : 2));
  
                  c.v = new long[1][1][1]; c.v[0][0][0] = 3; long val3 = get();
!                 assertEquals(val3, (isStableEnabled ? (isServerWithStable ? 1 : 2)
!                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
                                                      : 3));
  
                  c.v[0] = new long[1][1]; c.v[0][0][0] = 4; long val4 = get();
!                 assertEquals(val4, (isStableEnabled ? (isServerWithStable ? 1 : 2)
!                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
                                                      : 4));
  
                  c.v[0][0] = new long[1]; c.v[0][0][0] = 5; long val5 = get();
!                 assertEquals(val5, (isStableEnabled ? (isServerWithStable ? 1 : 2)
!                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 1 : 2)
                                                      : 5));
              }
  
              {
                  c.v = new long[1][1][1]; long[] val1 = get1();
                  c.v[0][0] = new long[1]; long[] val2 = get1();
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new long[1][1][1]; long[][] val1 = get2();
                  c.v[0] = new long[1][1]; long[][] val2 = get2();
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new long[1][1][1]; long[][][] val1 = get3();
                  c.v = new long[1][1][1]; long[][][] val2 = get3();

*** 338,382 ****
--- 337,381 ----
          public static void test() throws Exception {
              {
                  c.v = new long[1][1][1][1]; c.v[0][0][0][0] = 1; long val1 = get();
                                              c.v[0][0][0][0] = 2; long val2 = get();
                  assertEquals(val1, 1);
!                 assertEquals(val2, (isServerWithStable ? 1 : 2));
!                 assertEquals(val2, (isStableEnabled ? 1 : 2));
  
                  c.v = new long[1][1][1][1]; c.v[0][0][0][0] = 3; long val3 = get();
!                 assertEquals(val3, (isStableEnabled ? (isServerWithStable ? 1 : 2)
!                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
                                                      : 3));
  
                  c.v[0] = new long[1][1][1]; c.v[0][0][0][0] = 4; long val4 = get();
!                 assertEquals(val4, (isStableEnabled ? (isServerWithStable ? 1 : 2)
!                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
                                                      : 4));
  
                  c.v[0][0] = new long[1][1]; c.v[0][0][0][0] = 5; long val5 = get();
!                 assertEquals(val5, (isStableEnabled ? (isServerWithStable ? 1 : 2)
!                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 1 : 2)
                                                      : 5));
  
                  c.v[0][0][0] = new long[1]; c.v[0][0][0][0] = 6; long val6 = get();
!                 assertEquals(val6, (isStableEnabled ? (isServerWithStable ? 1 : 2)
!                 assertEquals(val6, (isStableEnabled ? (isStableEnabled ? 1 : 2)
                                                      : 6));
              }
  
              {
                  c.v = new long[1][1][1][1]; long[] val1 = get1();
                  c.v[0][0][0] = new long[1]; long[] val2 = get1();
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new long[1][1][1][1]; long[][] val1 = get2();
                  c.v[0][0] = new long[1][1]; long[][] val2 = get2();
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new long[1][1][1][1]; long[][][] val1 = get3();
                  c.v[0] = new long[1][1][1]; long[][][] val2 = get3();
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new long[1][1][1][1]; long[][][][] val1 = get4();
                  c.v = new long[1][1][1][1]; long[][][][] val2 = get4();

*** 432,442 ****
--- 431,441 ----
  
              {
                  c.v = new long[1][1]; c.v[0] = new long[0]; long[] val1 = get1();
                                       c.v[0] = new long[0]; long[] val2 = get1();
  
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new long[0][0]; Object[] val1 = get2();
                  c.v = new long[0][0]; Object[] val2 = get2();

*** 468,485 ****
--- 467,484 ----
  
              {
                  c.v = new long[1][1][1]; c.v[0][0] = new long[0]; long[] val1 = get1();
                                           c.v[0][0] = new long[0]; long[] val2 = get1();
  
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new long[1][1][1]; c.v[0] = new long[0][0]; long[][] val1 = get2();
                                           c.v[0] = new long[0][0]; long[][] val2 = get2();
  
!                 assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
!                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
              }
  
              {
                  c.v = new long[0][0][0]; Object[][] val1 = get3();
                  c.v = new long[0][0][0]; Object[][] val2 = get3();

*** 610,620 ****
--- 609,619 ----
                  c.v = new A[] { elem, elem }; c.v[0].left = c.v[0].right = c.v;
                                 elem.a = 1; long val1 = get(); long val2 = get1();
                                 elem.a = 2; long val3 = get(); long val4 = get1();
  
                  assertEquals(val1, 1);
!                 assertEquals(val3, (isServerWithStable ? 1 : 2));
!                 assertEquals(val3, (isStableEnabled ? 1 : 2));
  
                  assertEquals(val2, 1);
                  assertEquals(val4, 2);
              }
          }