--- old/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestLWorld.java	2019-05-15 13:58:05.215842036 -0400
+++ new/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestLWorld.java	2019-05-15 13:58:04.831840132 -0400
@@ -24,7 +24,6 @@
 package compiler.valhalla.valuetypes;
 
 import java.lang.invoke.*;
-import java.lang.reflect.Method;
 
 import jdk.experimental.value.MethodHandleBuilder;
 import jdk.test.lib.Asserts;
@@ -1285,7 +1284,7 @@
     // Tests writing an array element with a (statically known) incompatible type
     private static final MethodHandle setArrayElementIncompatible = MethodHandleBuilder.loadCode(MethodHandles.lookup(),
         "setArrayElementIncompatible",
-        MethodType.methodType(void.class, TestLWorld.class, MyValue1[].class, int.class, MyValue2.class.asValueType()),
+        MethodType.methodType(void.class, TestLWorld.class, MyValue1[].class, int.class, MyValue2.class.asPrimaryType()),
         CODE -> {
             CODE.
             aload_1().