commit 2ea4cc76a1a04ad16edccf5fe2486964f945a125
author Orion Hodson <oth@google.com> Wed Aug 26 17:48:31 2020 +0100
committer Orion Hodson <oth@google.com> Thu Aug 27 08:26:14 2020 +0000
tree cadce38e510bb60811198625e7ca009eafd7e69c
parent c3617cda17351ffd33ced81a3e03b87f59d4a41d

712-varhandle-invocation bogons

Fix a few bogons in the VarHandleTypeConversionTests.

Bug: 65872996
Test: art/test/run-test --host 712
Test: art/test/run-test --host --jvm 712
Change-Id: Ieace3a3d6f20e590f770c6c67e891e20c5e76354

test/712-varhandle-invocations/src/VarHandleTypeConversionTests.java

diff --git a/test/712-varhandle-invocations/src/VarHandleTypeConversionTests.java b/test/712-varhandle-invocations/src/VarHandleTypeConversionTests.java
index 6c02952..b394a31 100644
--- a/test/712-varhandle-invocations/src/VarHandleTypeConversionTests.java
+++ b/test/712-varhandle-invocations/src/VarHandleTypeConversionTests.java
@@ -39,12 +39,14 @@
             // Void is always okay for a return type.
             vh.setVolatile(this, 33);
             vh.get(this);
-            vh.compareAndSet(this, 33, 44);
-            vh.compareAndSet(this, 27, 16);
-            vh.weakCompareAndSet(this, 17, 19);
             vh.getAndSet(this, 200000);
             vh.getAndBitwiseXor(this, 0x5a5a5a5a);
             vh.getAndAdd(this, 99);
+
+            // Return type of these is boolean (JLS9 S15.12), but check anyway.
+            vh.compareAndSet(this, 33, 44);
+            vh.compareAndSet(this, 27, 16);
+            vh.weakCompareAndSet(this, 17, 19);
         }
 
         public static void main(String[] args) {
@@ -668,7 +670,7 @@
             vh.set((short) 1);
             vh.set((int) 1);
             vh.set((long) 1);
-            vh.set((double) 1.0f);
+            vh.set((float) 1.0f);
             vh.set((double) 1.0);
         }
 
@@ -1377,26 +1379,29 @@
             } catch (WrongMethodTypeException e) {
             }
             try {
-                vh.set((short) 1);
+                vh.set('A');
                 failUnreachable();
             } catch (WrongMethodTypeException e) {
             }
             try {
-                vh.set('A');
+                vh.set((short) 1);
                 failUnreachable();
             } catch (WrongMethodTypeException e) {
             }
             vh.set(2);
             try {
                 vh.setRelease(Long.MAX_VALUE);
+                failUnreachable();
             } catch (WrongMethodTypeException e) {
             }
             try {
                 vh.setRelease(Float.MAX_VALUE);
+                failUnreachable();
             } catch (WrongMethodTypeException e) {
             }
             try {
                 vh.setRelease(Double.MAX_VALUE);
+                failUnreachable();
             } catch (WrongMethodTypeException e) {
             }
             vh.set(null);