--- old/test/jdk/java/lang/invoke/VarHandles/generate-vh-tests.sh	2019-06-13 11:00:22.889713863 -0400
+++ new/test/jdk/java/lang/invoke/VarHandles/generate-vh-tests.sh	2019-06-13 11:00:22.497711919 -0400
@@ -9,7 +9,7 @@
 # desirable to generate code using ASM which will allow more flexibility
 # in the kinds of tests that are generated.
 
-for type in boolean byte short char int long float double String
+for type in boolean byte short char int long float double String Point
 do
   Type="$(tr '[:lower:]' '[:upper:]' <<< ${type:0:1})${type:1}"
   args="-K$type -Dtype=$type -DType=$Type"
@@ -29,11 +29,17 @@
   esac
 
   case $type in
-    boolean|byte|short|char|int|long|float|double)
+    boolean|byte|short|char|int|long|float|double|Point)
       args="$args -KValue"
       ;;
   esac
 
+  case $type in
+    String|Point)
+      args="$args -KClass"
+      ;;
+  esac
+
   wrong_primitive_type=boolean
 
   case $type in
@@ -82,6 +88,11 @@
       value1=\"foo\"
       value2=\"bar\"
       value3=\"baz\"
+       ;;
+    Point)
+      value1="Point.getInstance(1,1)"
+      value2="Point.getInstance(2,2)"
+      value3="Point.getInstance(3,3)"
       ;;
   esac