--- a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template Mon Jun 06 16:18:01 2016 -0700
+++ b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template Wed Jun 15 11:20:15 2016 +0300
@@ -568,7 +568,7 @@
$type$ o = ($type$) vh.getAndAdd(recv, $value3$);
assertEquals(o, $value1$, "getAndAdd $type$");
$type$ c = ($type$) vh.addAndGet(recv, $value3$);
- assertEquals(c, $value1$ + $value3$ + $value3$, "getAndAdd $type$ value");
+ assertEquals(c, ($type$)($value1$ + $value3$ + $value3$), "getAndAdd $type$ value");
}
#end[AtomicAdd]
}
@@ -771,7 +771,7 @@
$type$ o = ($type$) vh.getAndAdd( $value3$);
assertEquals(o, $value1$, "getAndAdd $type$");
$type$ c = ($type$) vh.addAndGet($value3$);
- assertEquals(c, $value1$ + $value3$ + $value3$, "getAndAdd $type$ value");
+ assertEquals(c, ($type$)($value1$ + $value3$ + $value3$), "getAndAdd $type$ value");
}
#end[AtomicAdd]
}
@@ -977,7 +977,7 @@
$type$ o = ($type$) vh.getAndAdd(array, i, $value3$);
assertEquals(o, $value1$, "getAndAdd $type$");
$type$ c = ($type$) vh.addAndGet(array, i, $value3$);
- assertEquals(c, $value1$ + $value3$ + $value3$, "getAndAdd $type$ value");
+ assertEquals(c, ($type$)($value1$ + $value3$ + $value3$), "getAndAdd $type$ value");
}
#end[AtomicAdd]
}