Cleanup.

Author: lahodaj

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java

@@ -376,7 +376,7 @@ public void visitTopLevel(JCCompilationUnit tree) {
                 Name name = names.package_info;
                 ClassSymbol c = syms.enterClass(tree.modle, name, tree.packge);
                 c.flatname = names.fromString(tree.packge + "." + name);
-                c.sourcefile = tree.sourcefile;
+                c.classfile = c.sourcefile = tree.sourcefile;
             c.completer = Completer.NULL_COMPLETER;
                 c.members_field = WriteableScope.create(c);
                 tree.packge.package_info = c;
@@ -495,7 +495,7 @@ public void visitClassDef(JCClassDecl tree) {
         // Fill out class fields.
         c.completer = Completer.NULL_COMPLETER; // do not allow the initial completer linger on.
         c.flags_field = chk.checkFlags(tree.pos(), tree.mods.flags, c, tree);
-        c.sourcefile = env.toplevel.sourcefile;
+        c.classfile = c.sourcefile = env.toplevel.sourcefile;
         c.members_field = WriteableScope.create(c);
         c.clearAnnotationMetadata();
 

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java

@@ -329,7 +329,7 @@ private void enterModule(JCCompilationUnit toplevel, ClassSymbol c, Set<ModuleSy
                 }
             }
             sym.completer = getSourceCompleter(toplevel);
-            sym.module_info.sourcefile = toplevel.sourcefile;
+            sym.module_info.classfile = sym.module_info.sourcefile = toplevel.sourcefile;
             decl.sym = sym;
 
             if (multiModuleMode || modules.isEmpty()) {

src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java

@@ -735,21 +735,16 @@ public JavaFileObject getFileObjectOf(Element e) {
                 if (((PackageSymbol) sym).package_info == null) {
                     yield null;
                 }
-                yield getFileObjectOf(((PackageSymbol) sym).package_info);
+                yield ((PackageSymbol) sym).package_info.classfile;
             }
             case MDL -> {
                 ModuleSymbol msym = (ModuleSymbol) sym;
-                yield getFileObjectOf(msym.module_info);
+                yield msym.module_info.classfile;
             }
-            case TYP -> getFileObjectOf((ClassSymbol) sym);
-            default -> getFileObjectOf(sym.enclClass());
+            case TYP -> ((ClassSymbol) sym).classfile;
+            default -> sym.enclClass().classfile;
         };
     }
-    //where:
-        private static JavaFileObject getFileObjectOf(ClassSymbol sym) {
-            return sym.classfile != null ? sym.classfile
-                                         : sym.sourcefile;
-        }
 
     /**
      * Returns the tree node and compilation unit corresponding to this

test/langtools/tools/javac/processing/model/element/TestFileObjectOf.java

@@ -23,8 +23,8 @@
 
 /*
  * @test
- * @bug 9999999
- * @summary XXX
+ * @bug 8224922
+ * @summary Verify the behavior of the Elements.getFileObjectOf
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main