--- a/hotspot/test/compiler/stable/TestStableByte.java Wed Jun 15 14:27:58 2016 +0200
+++ b/hotspot/test/compiler/stable/TestStableByte.java Wed Jun 01 09:13:10 2016 +0300
@@ -100,7 +100,7 @@
public static final DefaultValue c = new DefaultValue();
public static byte get() { return c.v; }
public static void test() throws Exception {
- byte val1 = get();
+ byte val1 = get();
c.v = 1; byte val2 = get();
assertEquals(val1, 0);
assertEquals(val2, 1);
@@ -130,7 +130,7 @@
public static final DefaultStaticValue c = new DefaultStaticValue();
public static byte get() { return c.v; }
public static void test() throws Exception {
- byte val1 = get();
+ byte val1 = get();
c.v = 1; byte val2 = get();
assertEquals(val1, 0);
assertEquals(val2, 1);
@@ -180,24 +180,24 @@
public static void test() throws Exception {
{
c.v = new byte[1]; c.v[0] = 1; byte val1 = get();
- c.v[0] = 2; byte val2 = get();
+ c.v[0] = 2; byte val2 = get();
assertEquals(val1, 1);
assertEquals(val2, (isStableEnabled ? 1 : 2));
c.v = new byte[1]; c.v[0] = 3; byte val3 = get();
assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
- : 3));
+ : 3));
}
{
c.v = new byte[20]; c.v[10] = 1; byte val1 = get1();
- c.v[10] = 2; byte val2 = get1();
+ c.v[10] = 2; byte val2 = get1();
assertEquals(val1, 1);
assertEquals(val2, (isStableEnabled ? 1 : 2));
c.v = new byte[20]; c.v[10] = 3; byte val3 = get1();
assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
- : 3));
+ : 3));
}
{
@@ -220,17 +220,17 @@
public static void test() throws Exception {
{
c.v = new byte[1][1]; c.v[0][0] = 1; byte val1 = get();
- c.v[0][0] = 2; byte val2 = get();
+ c.v[0][0] = 2; byte val2 = get();
assertEquals(val1, 1);
assertEquals(val2, (isStableEnabled ? 1 : 2));
c.v = new byte[1][1]; c.v[0][0] = 3; byte val3 = get();
assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
- : 3));
+ : 3));
c.v[0] = new byte[1]; c.v[0][0] = 4; byte val4 = get();
assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
- : 4));
+ : 4));
}
{
@@ -260,21 +260,21 @@
public static void test() throws Exception {
{
c.v = new byte[1][1][1]; c.v[0][0][0] = 1; byte val1 = get();
- c.v[0][0][0] = 2; byte val2 = get();
+ c.v[0][0][0] = 2; byte val2 = get();
assertEquals(val1, 1);
assertEquals(val2, (isStableEnabled ? 1 : 2));
c.v = new byte[1][1][1]; c.v[0][0][0] = 3; byte val3 = get();
assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
- : 3));
+ : 3));
c.v[0] = new byte[1][1]; c.v[0][0][0] = 4; byte val4 = get();
assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
- : 4));
+ : 4));
c.v[0][0] = new byte[1]; c.v[0][0][0] = 5; byte val5 = get();
assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 1 : 2)
- : 5));
+ : 5));
}
{
@@ -311,25 +311,25 @@
public static void test() throws Exception {
{
c.v = new byte[1][1][1][1]; c.v[0][0][0][0] = 1; byte val1 = get();
- c.v[0][0][0][0] = 2; byte val2 = get();
+ c.v[0][0][0][0] = 2; byte val2 = get();
assertEquals(val1, 1);
assertEquals(val2, (isStableEnabled ? 1 : 2));
c.v = new byte[1][1][1][1]; c.v[0][0][0][0] = 3; byte val3 = get();
assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
- : 3));
+ : 3));
c.v[0] = new byte[1][1][1]; c.v[0][0][0][0] = 4; byte val4 = get();
assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
- : 4));
+ : 4));
c.v[0][0] = new byte[1][1]; c.v[0][0][0][0] = 5; byte val5 = get();
assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 1 : 2)
- : 5));
+ : 5));
c.v[0][0][0] = new byte[1]; c.v[0][0][0][0] = 6; byte val6 = get();
assertEquals(val6, (isStableEnabled ? (isStableEnabled ? 1 : 2)
- : 6));
+ : 6));
}
{
@@ -372,7 +372,7 @@
public static void test() throws Exception {
{
c.v = new byte[1]; ((byte[])c.v)[0] = 1; byte val1 = get();
- ((byte[])c.v)[0] = 2; byte val2 = get();
+ ((byte[])c.v)[0] = 2; byte val2 = get();
assertEquals(val1, 1);
assertEquals(val2, 2);
@@ -399,7 +399,7 @@
public static void test() throws Exception {
{
c.v = new byte[1][1]; ((byte[][])c.v)[0][0] = 1; byte val1 = get();
- ((byte[][])c.v)[0][0] = 2; byte val2 = get();
+ ((byte[][])c.v)[0][0] = 2; byte val2 = get();
assertEquals(val1, 1);
assertEquals(val2, 2);
@@ -407,7 +407,7 @@
{
c.v = new byte[1][1]; c.v[0] = new byte[0]; byte[] val1 = get1();
- c.v[0] = new byte[0]; byte[] val2 = get1();
+ c.v[0] = new byte[0]; byte[] val2 = get1();
assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
}
@@ -434,8 +434,8 @@
public static void test() throws Exception {
{
- c.v = new byte[1][1][1]; ((byte[][][])c.v)[0][0][0] = 1; byte val1 = get();
- ((byte[][][])c.v)[0][0][0] = 2; byte val2 = get();
+ c.v = new byte[1][1][1]; ((byte[][][])c.v)[0][0][0] = 1; byte val1 = get();
+ ((byte[][][])c.v)[0][0][0] = 2; byte val2 = get();
assertEquals(val1, 1);
assertEquals(val2, 2);
@@ -443,14 +443,14 @@
{
c.v = new byte[1][1][1]; c.v[0][0] = new byte[0]; byte[] val1 = get1();
- c.v[0][0] = new byte[0]; byte[] val2 = get1();
+ c.v[0][0] = new byte[0]; byte[] val2 = get1();
assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
}
{
c.v = new byte[1][1][1]; c.v[0] = new byte[0][0]; byte[][] val1 = get2();
- c.v[0] = new byte[0][0]; byte[][] val2 = get2();
+ c.v[0] = new byte[0][0]; byte[][] val2 = get2();
assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
}
@@ -480,7 +480,7 @@
public static void test() throws Exception {
{
c.v = new A(); c.v.a = 1; A val1 = get();
- c.v.a = 2; A val2 = get();
+ c.v.a = 2; A val2 = get();
assertEquals(val1.a, 2);
assertEquals(val2.a, 2);
@@ -488,7 +488,7 @@
{
c.v = new A(); c.v.a = 1; byte val1 = get1();
- c.v.a = 2; byte val2 = get1();
+ c.v.a = 2; byte val2 = get1();
c.v = new A(); c.v.a = 3; byte val3 = get1();
assertEquals(val1, 1);
@@ -514,8 +514,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 = 1; c.v.next.a = 1; A val1 = get();
- c.v.a = 2; c.v.next.a = 2; A val2 = get();
+ c.v.a = 1; c.v.next.a = 1; A val1 = get();
+ c.v.a = 2; c.v.next.a = 2; A val2 = get();
assertEquals(val1.a, 2);
assertEquals(val2.a, 2);
@@ -523,10 +523,10 @@
{
c.v = new A(); c.v.next = c.v;
- c.v.a = 1; byte val1 = get1();
- c.v.a = 2; byte val2 = get1();
+ c.v.a = 1; byte val1 = get1();
+ c.v.a = 2; byte val2 = get1();
c.v = new A(); c.v.next = c.v;
- c.v.a = 3; byte val3 = get1();
+ c.v.a = 3; byte val3 = get1();
assertEquals(val1, 1);
assertEquals(val2, (isStableEnabled ? 1 : 2));
@@ -552,8 +552,8 @@
public static void test() throws Exception {
{
c.v = new A(); c.v.left = c.v.right = c.v;
- c.v.a = 1; byte val1 = get(); byte val2 = get1();
- c.v.a = 2; byte val3 = get(); byte val4 = get1();
+ c.v.a = 1; byte val1 = get(); byte val2 = get1();
+ c.v.a = 2; byte val3 = get(); byte val4 = get1();
assertEquals(val1, 1);
assertEquals(val3, (isStableEnabled ? 1 : 2));
@@ -583,8 +583,8 @@
{
A elem = new A();
c.v = new A[] { elem, elem }; c.v[0].left = c.v[0].right = c.v;
- elem.a = 1; byte val1 = get(); byte val2 = get1();
- elem.a = 2; byte val3 = get(); byte val4 = get1();
+ elem.a = 1; byte val1 = get(); byte val2 = get1();
+ elem.a = 2; byte val3 = get(); byte val4 = get1();
assertEquals(val1, 1);
assertEquals(val3, (isStableEnabled ? 1 : 2));