--- old/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java	2016-06-17 15:22:59.632106106 -0700
+++ new/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java	2016-06-17 15:22:59.548102470 -0700
@@ -124,7 +124,7 @@
             }
 
             public Integer visitMethodHandle(CONSTANT_MethodHandle_info info, Void p) {
-                print("#" + info.reference_kind.tag + ":#" + info.reference_index);
+                print(info.reference_kind.tag + ":#" + info.reference_index);
                 tab();
                 println("// " + stringValue(info));
                 return 1;
@@ -326,7 +326,7 @@
 
         public String visitMethodHandle(CONSTANT_MethodHandle_info info, Void p) {
             try {
-                return info.reference_kind.name + " " + stringValue(info.getCPRefInfo());
+                return info.reference_kind + " " + stringValue(info.getCPRefInfo());
             } catch (ConstantPoolException e) {
                 return report(e);
             }