--- old/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template	2019-06-13 11:00:19.157695357 -0400
+++ new/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template	2019-06-13 11:00:18.749693334 -0400
@@ -21,6 +21,8 @@
  * questions.
  */
 
+#warn
+
 #if[Value]
 /*
  * @test
@@ -78,9 +80,9 @@
 
     VarHandle vhArray;
 
-#if[String]
+#if[Class]]
     VarHandle vhArrayObject;
-#end[String]
+#end[Class]]
 #if[Value]
     VarHandle vhValueTypeField;
 #end[Value]
@@ -139,9 +141,9 @@
             VarHandleTestAccess$Type$.class, "static_v", $type$.class);
 
         vhArray = MethodHandles.arrayElementVarHandle($type$[].class);
-#if[String]
+#if[Class]]
         vhArrayObject = MethodHandles.arrayElementVarHandle(Object[].class);
-#end[String]
+#end[Class]]
 
 #if[Value]
         vhValueTypeField = MethodHandles.lookup().findVarHandle(
@@ -328,21 +330,21 @@
 
         cases.add(new VarHandleAccessTestCase("Array",
                                               vhArray, VarHandleTestAccess$Type$::testArray));
-#if[String]
+#if[Class]]
         cases.add(new VarHandleAccessTestCase("Array Object[]",
                                               vhArrayObject, VarHandleTestAccess$Type$::testArray));
-#end[String]
+#end[Class]]
         cases.add(new VarHandleAccessTestCase("Array unsupported",
                                               vhArray, VarHandleTestAccess$Type$::testArrayUnsupported,
                                               false));
         cases.add(new VarHandleAccessTestCase("Array index out of bounds",
                                               vhArray, VarHandleTestAccess$Type$::testArrayIndexOutOfBounds,
                                               false));
-#if[String]
+#if[Class]]
         cases.add(new VarHandleAccessTestCase("Array store exception",
                                               vhArrayObject, VarHandleTestAccess$Type$::testArrayStoreException,
                                               false));
-#end[String]
+#end[Class]]
 #if[Value]
         cases.add(new VarHandleAccessTestCase("Value type field",
                                               vhValueTypeField, vh -> testValueTypeField(Value.getInstance(), vh)));
@@ -1946,7 +1948,7 @@
         }
     }
 
-#if[String]
+#if[Class]]
     static void testArrayStoreException(VarHandle vh) throws Throwable {
         Object[] array = new $type$[10];
         Arrays.fill(array, $value1$);
@@ -2027,6 +2029,6 @@
             $type$ x = ($type$) vh.getAndSetRelease(array, 0, value);
         });
     }
-#end[String]
+#end[Class]]
 }