src/share/classes/com/sun/tools/javac/comp/MemberEnter.java

@@ -642,11 +642,11 @@
             new VarSymbol(0, tree.name, tree.vartype.type, enclScope.owner);
         v.flags_field = chk.checkFlags(tree.pos(), tree.mods.flags, v, tree);
         tree.sym = v;
         if (tree.init != null) {
             v.flags_field |= HASINIT;
-            if ((v.flags_field & FINAL) != 0 && tree.init.getTag() != JCTree.NEWCLASS) {
+            if ((v.flags_field & FINAL) != 0 && tree.init.getTag() != JCTree.Tag.NEWCLASS) {
                 Env<AttrContext> initEnv = getInitEnv(tree, env);
                 initEnv.info.enclVar = v;
                 v.setLazyConstValue(initEnv(tree, initEnv), attr, tree.init);
             }
         }

@@ -866,11 +866,11 @@
             c.flags_field |= UNATTRIBUTED;
 
             // If this is a toplevel-class, make sure any preceding import
             // clauses have been seen.
             if (c.owner.kind == PCK) {
-                memberEnter(env.toplevel, env.enclosing(JCTree.TOPLEVEL));
+                memberEnter(env.toplevel, env.enclosing(JCTree.Tag.TOPLEVEL));
                 todo.append(env);
             }
 
             if (c.owner.kind == TYP)
                 c.owner.complete();