changeset 53154:df2a954edeae lworld

Test fixes for MethodBuilder.loadCode API change
author dsimms
date Mon, 03 Dec 2018 14:22:02 +0100
parents 5a029fca0235
children 42678a58ba1f
files test/hotspot/jtreg/runtime/valhalla/valuetypes/ValueOops.java test/hotspot/jtreg/runtime/valhalla/valuetypes/ValueTypesTest.java
diffstat 2 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/test/hotspot/jtreg/runtime/valhalla/valuetypes/ValueOops.java	Mon Dec 03 14:29:19 2018 +0100
+++ b/test/hotspot/jtreg/runtime/valhalla/valuetypes/ValueOops.java	Mon Dec 03 14:22:02 2018 +0100
@@ -305,10 +305,10 @@
      */
     public static void testOverGc() {
         try {
-            Class<?> vtClass = Person.class;
+            Class<?> vtClass = Person.class.asValueType();
 
-	    System.out.println("vtClass="+vtClass);
-	    
+            System.out.println("vtClass="+vtClass);
+
             doGc();
 
             // VT on stack and lvt, null refs, see if GC flies
@@ -329,7 +329,7 @@
                         .invokestatic(ValueOops.class, "doGc", "()V", false) // Stack,LVT
                         .pop()
                         .areturn();
-                    }, vtClass);
+                    });
             Person person = (Person) moveValueThroughStackAndLvt.invokeExact(createDefaultPerson());
             validateDefaultPerson(person);
             doGc();
@@ -608,7 +608,7 @@
                             .aastore()
                             .pop()
                             .return_();
-                        }, FooValue.class).invoke(oopMaps);
+                        }).invoke(oopMaps);
             } catch (Throwable t) { fail("exerciseVBytecodeExprStackWithDefault", t); }
         }
 
@@ -631,7 +631,7 @@
                             .aastore()
                             .pop()
                             .return_();
-					     }, FooValue.class).invoke(fa, oopMaps);
+                        }).invoke(fa, oopMaps);
             } catch (Throwable t) { fail("exerciseVBytecodeExprStackWithRefs", t); }
         }
     }
--- a/test/hotspot/jtreg/runtime/valhalla/valuetypes/ValueTypesTest.java	Mon Dec 03 14:29:19 2018 +0100
+++ b/test/hotspot/jtreg/runtime/valhalla/valuetypes/ValueTypesTest.java	Mon Dec 03 14:22:02 2018 +0100
@@ -129,7 +129,7 @@
                     .label("end")
                     .iconst_0()
                     .return_(TypeTag.Z);
-                }, valueClass);
+                });
         boolean result = (boolean) fromExecStackToLocalVar.invokeExact();
         System.out.println(result);
         assertTrue(result, "Invariant");
@@ -140,7 +140,7 @@
         String sig = "()Q" + valueClass.getName() + ";";
         final String methodSignature = sig.replace('.', '/');
         final String fieldQSignature = "Q" + valueClass.getName().replace('.', '/') + ";";
-	final String fieldLSignature = "L" + valueClass.getName().replace('.', '/') + ";";
+        final String fieldLSignature = "L" + valueClass.getName().replace('.', '/') + ";";
         System.out.println(methodSignature);
         MethodHandle fromExecStackToFields = MethodHandleBuilder.loadCode(
                 LOOKUP,
@@ -199,7 +199,7 @@
                     .label("failed")
                     .iconst_0()
                     .return_(TypeTag.Z);
-                }, valueClass);
+                });
         boolean result = (boolean) fromExecStackToFields.invokeExact();
         System.out.println(result);
         assertTrue(result, "Invariant");
@@ -273,7 +273,7 @@
                     .label("failed")
                     .iconst_0()
                     .return_(TypeTag.Z);
-                }, valueClass);
+                });
         boolean result = (boolean) fromExecStackToValueArray.invokeExact();
         System.out.println(result);
         assertTrue(result, "Invariant");