1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Enter.java Mon Feb 07 18:09:46 2011 +0000
1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Enter.java Mon Feb 07 18:10:13 2011 +0000
1.3 @@ -95,7 +95,6 @@
1.4
1.5 Log log;
1.6 Symtab syms;
1.7 - Scope.ScopeCounter scopeCounter;
1.8 Check chk;
1.9 TreeMaker make;
1.10 ClassReader reader;
1.11 @@ -123,7 +122,6 @@
1.12 reader = ClassReader.instance(context);
1.13 make = TreeMaker.instance(context);
1.14 syms = Symtab.instance(context);
1.15 - scopeCounter = Scope.ScopeCounter.instance(context);
1.16 chk = Check.instance(context);
1.17 memberEnter = MemberEnter.instance(context);
1.18 types = Types.instance(context);
1.19 @@ -192,7 +190,7 @@
1.20 */
1.21 public Env<AttrContext> classEnv(JCClassDecl tree, Env<AttrContext> env) {
1.22 Env<AttrContext> localEnv =
1.23 - env.dup(tree, env.info.dup(new Scope.ClassScope(tree.sym, scopeCounter)));
1.24 + env.dup(tree, env.info.dup(new Scope(tree.sym)));
1.25 localEnv.enclClass = tree;
1.26 localEnv.outer = env;
1.27 localEnv.info.isSelfCall = false;
1.28 @@ -328,7 +326,7 @@
1.29 c.flatname = names.fromString(tree.packge + "." + name);
1.30 c.sourcefile = tree.sourcefile;
1.31 c.completer = null;
1.32 - c.members_field = new Scope.ClassScope(c, scopeCounter);
1.33 + c.members_field = new Scope(c);
1.34 tree.packge.package_info = c;
1.35 }
1.36 classEnter(tree.defs, topEnv);
1.37 @@ -396,7 +394,7 @@
1.38 c.completer = memberEnter;
1.39 c.flags_field = chk.checkFlags(tree.pos(), tree.mods.flags, c, tree);
1.40 c.sourcefile = env.toplevel.sourcefile;
1.41 - c.members_field = new Scope.ClassScope(c, scopeCounter);
1.42 + c.members_field = new Scope(c);
1.43
1.44 ClassType ct = (ClassType)c.type;
1.45 if (owner.kind != PCK && (c.flags_field & STATIC) == 0) {
