src/jdk.jdeps/share/classes/com/sun/tools/javap/ConstantWriter.java

@@ -107,17 +107,10 @@
             public Integer visitLong(CONSTANT_Long_info info, Void p) {
                 println(stringValue(info));
                 return 2;
             }
 
-            public Integer visitNameAndType(CONSTANT_NameAndType_info info, Void p) {
-                print("#" + info.name_index + ":#" + info.type_index);
-                tab();
-                println("// " + stringValue(info));
-                return 1;
-            }
-
             public Integer visitMethodref(CONSTANT_Methodref_info info, Void p) {
                 print("#" + info.class_index + ".#" + info.name_and_type_index);
                 tab();
                 println("// " + stringValue(info));
                 return 1;

@@ -135,10 +128,31 @@
                 tab();
                 println("//  " + stringValue(info));
                 return 1;
             }
 
+            public Integer visitModule(CONSTANT_Module_info info, Void p) {
+                print("#" + info.name_index);
+                tab();
+                println("// " + stringValue(info));
+                return 1;
+            }
+
+            public Integer visitNameAndType(CONSTANT_NameAndType_info info, Void p) {
+                print("#" + info.name_index + ":#" + info.type_index);
+                tab();
+                println("// " + stringValue(info));
+                return 1;
+            }
+
+            public Integer visitPackage(CONSTANT_Package_info info, Void p) {
+                print("#" + info.name_index);
+                tab();
+                println("// " + stringValue(info));
+                return 1;
+            }
+
             public Integer visitString(CONSTANT_String_info info, Void p) {
                 print("#" + info.string_index);
                 tab();
                 println("// " + stringValue(info));
                 return 1;

@@ -302,10 +316,18 @@
 
         public String visitLong(CONSTANT_Long_info info, Void p) {
             return info.value + "l";
         }
 
+        public String visitModule(CONSTANT_Module_info info, Void p) {
+            try {
+                return checkName(info.getName());
+            } catch (ConstantPoolException e) {
+                return report(e);
+            }
+        }
+
         public String visitNameAndType(CONSTANT_NameAndType_info info, Void p) {
             return getCheckedName(info) + ":" + getType(info);
         }
 
         String getCheckedName(CONSTANT_NameAndType_info info) {

@@ -314,10 +336,18 @@
             } catch (ConstantPoolException e) {
                 return report(e);
             }
         }
 
+        public String visitPackage(CONSTANT_Package_info info, Void p) {
+            try {
+                return checkName(info.getName());
+            } catch (ConstantPoolException e) {
+                return report(e);
+            }
+        }
+
         String getType(CONSTANT_NameAndType_info info) {
             try {
                 return info.getType();
             } catch (ConstantPoolException e) {
                 return report(e);