1.1 --- a/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Sat Nov 05 00:02:33 2011 -0700
1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Tue Nov 08 11:51:05 2011 -0800
1.3 @@ -40,8 +40,10 @@
1.4 import com.sun.tools.javac.tree.JCTree.*;
1.5
1.6 import static com.sun.tools.javac.code.Flags.*;
1.7 +import static com.sun.tools.javac.code.Flags.ANNOTATION;
1.8 import static com.sun.tools.javac.code.Kinds.*;
1.9 import static com.sun.tools.javac.code.TypeTags.*;
1.10 +import static com.sun.tools.javac.tree.JCTree.Tag.*;
1.11 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
1.12
1.13 /** This is the second phase of Enter, in which classes are completed
1.14 @@ -644,7 +646,7 @@
1.15 tree.sym = v;
1.16 if (tree.init != null) {
1.17 v.flags_field |= HASINIT;
1.18 - if ((v.flags_field & FINAL) != 0 && tree.init.getTag() != JCTree.NEWCLASS) {
1.19 + if ((v.flags_field & FINAL) != 0 && !tree.init.hasTag(NEWCLASS)) {
1.20 Env<AttrContext> initEnv = getInitEnv(tree, env);
1.21 initEnv.info.enclVar = v;
1.22 v.setLazyConstValue(initEnv(tree, initEnv), attr, tree.init);
1.23 @@ -868,7 +870,7 @@
1.24 // If this is a toplevel-class, make sure any preceding import
1.25 // clauses have been seen.
1.26 if (c.owner.kind == PCK) {
1.27 - memberEnter(env.toplevel, env.enclosing(JCTree.TOPLEVEL));
1.28 + memberEnter(env.toplevel, env.enclosing(TOPLEVEL));
1.29 todo.append(env);
1.30 }
1.31
