8309568: javac crashes attempting to -Xprint on a class file of an unnamed class

Jim Laskey · Jim Laskey · commit a6726b66dbb3 · 2023-06-07T11:34:23.000Z
Reviewed-by: darcy, jlahoda
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
@@ -2731,7 +2731,10 @@ private void readClassBuffer(ClassSymbol c) throws IOException {
         }
         readClass(c);
         if (previewClassFile) {
-            if ((c.flags_field & SYNTHETIC) != 0 && c.isSubClass(syms.objectType.tsym, types)) {
+            if ((c.flags_field & SYNTHETIC) != 0 &&
+                    c.owner.kind == PCK &&
+                    (c.flags_field & AUXILIARY) == 0 &&
+                    (c.flags_field & FINAL) != 0) {
                 c.flags_field |= UNNAMED_CLASS;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -2731,7 +2731,10 @@ private void readClassBuffer(ClassSymbol c) throws IOException {`
`2731`	`2731`	`}`
`2732`	`2732`	`readClass(c);`
`2733`	`2733`	`if (previewClassFile) {`
`2734`		`- if ((c.flags_field & SYNTHETIC) != 0 && c.isSubClass(syms.objectType.tsym, types)) {`
	`2734`	`+ if ((c.flags_field & SYNTHETIC) != 0 &&`
	`2735`	`+ c.owner.kind == PCK &&`
	`2736`	`+ (c.flags_field & AUXILIARY) == 0 &&`
	`2737`	`+ (c.flags_field & FINAL) != 0) {`
`2735`	`2738`	`c.flags_field \|= UNNAMED_CLASS;`
`2736`	`2739`	`}`
`2737`	`2740`	`}`