Merge pull request #6 from lahodaj/JDK-8224922-4

jddarcy · web-flow · commit a62ff194eb62 · 2021-11-17T21:48:30.000-08:00
Adding forgotten file/fixing test.
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java
@@ -746,8 +746,8 @@ public JavaFileObject getFileObjectOf(Element e) {
                 }
                 yield msym.module_info.classfile;
             }
-            case TYP -> ((ClassSymbol) sym).outermostClass().classfile;
-            default -> sym.outermostClass().classfile;
+            case TYP -> ((ClassSymbol) sym).classfile;
+            default -> sym.enclClass().classfile;
         };
     }
 

Original file line number	Diff line number	Diff line change
`@@ -746,8 +746,8 @@ public JavaFileObject getFileObjectOf(Element e) {`
`746`	`746`	`}`
`747`	`747`	`yield msym.module_info.classfile;`
`748`	`748`	`}`
`749`		`- case TYP -> ((ClassSymbol) sym).outermostClass().classfile;`
`750`		`- default -> sym.outermostClass().classfile;`
	`749`	`+ case TYP -> ((ClassSymbol) sym).classfile;`
	`750`	`+ default -> sym.enclClass().classfile;`
`751`	`751`	`};`
`752`	`752`	`}`
`753`	`753`