--- old/jdk/src/java.base/share/classes/valhalla/shady/ValueTypeHolder.java	2017-09-19 16:01:50.000000000 -0700
+++ new/jdk/src/java.base/share/classes/valhalla/shady/ValueTypeHolder.java	2017-09-19 16:01:50.000000000 -0700
@@ -495,8 +495,8 @@
     private MethodHandle getOrLoad(Lookup lookup, ValueHandleKey key, Supplier<MethodType> typeSupplier, Consumer<? super MethodHandleCodeBuilder<?>> codeBuilder) {
         MethodHandle result = handleMap.get(key);
         if (result == null) {
-            String handleDebugName = sourceClass().getName() + "_" + key.kind.handleName();
-            result = MethodHandleBuilder.loadCode(lookup, handleDebugName, typeSupplier.get(), codeBuilder);
+            String handleClassName = sourceClass().getName() + "_" + key.kind.handleName();
+            result = MethodHandleBuilder.loadCode(lookup, handleClassName, key.kind.handleName(), typeSupplier.get(), codeBuilder);
             handleMap.put(key, result);
         }
         return result;