--- old/jdk/src/java.base/share/classes/jdk/experimental/value/MethodHandleBuilder.java	2017-09-14 22:58:04.000000000 -0700
+++ new/jdk/src/java.base/share/classes/jdk/experimental/value/MethodHandleBuilder.java	2017-09-14 22:58:03.000000000 -0700
@@ -39,6 +39,7 @@
 import jdk.internal.misc.Unsafe;
 import sun.security.action.GetPropertyAction;
 import valhalla.shady.MinimalValueTypes_1_0;
+import valhalla.shady.ValueTypeHolder;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles.Lookup;
@@ -104,11 +105,11 @@
         }
     }
 
-    static class IsolatedMethodBuilder extends ClassBuilder<Class<?>, String, IsolatedMethodBuilder> {
+    public static class IsolatedMethodBuilder extends ClassBuilder<Class<?>, String, IsolatedMethodBuilder> {
 
         private static final Class<?> THIS_CLASS = new Object() { }.getClass();
 
-        IsolatedMethodBuilder(String clazz, Lookup lookup) {
+        public IsolatedMethodBuilder(String clazz, Lookup lookup) {
             super(ENABLE_POOL_PATCHES ?
                             new IsolatedMethodPatchingPoolHelper(clazz) :
                             new IsolatedMethodPoolHelper(clazz),
@@ -116,7 +117,7 @@
             withThisClass(THIS_CLASS);
         }
 
-        Class<?> thisClass() {
+        public Class<?> thisClass() {
             return THIS_CLASS;
         }
 
@@ -182,7 +183,7 @@
                         Class<?> box = Class.forName(basicTypeHelper.symbol(desc)
                                 .replaceAll("/", ".")
                                 .replaceAll("\\$Value", ""), true, lookup.lookupClass().getClassLoader());
-                        ValueType<?> vt = ValueType.forClass(box);
+                        ValueTypeHolder<?> vt = MinimalValueTypes_1_0.getValueFor(box);
                         return numDims == 0 ?
                                 vt.valueClass() : vt.arrayValueClass(numDims);
                     } catch (ReflectiveOperationException ex) {