--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Mon Feb 07 18:09:46 2011 +0000
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Mon Feb 07 18:10:13 2011 +0000
@@ -68,7 +68,6 @@
private Names names;
private Log log;
private Symtab syms;
- private Scope.ScopeCounter scopeCounter;
private Resolve rs;
private Check chk;
private Attr attr;
@@ -91,7 +90,6 @@
names = Names.instance(context);
log = Log.instance(context);
syms = Symtab.instance(context);
- scopeCounter = Scope.ScopeCounter.instance(context);
rs = Resolve.instance(context);
chk = Check.instance(context);
attr = Attr.instance(context);
@@ -571,7 +569,7 @@
c.flatname = chk.localClassName(c);
c.sourcefile = owner.sourcefile;
c.completer = null;
- c.members_field = new Scope.ClassScope(c, scopeCounter);
+ c.members_field = new Scope(c);
c.flags_field = flags;
ClassType ctype = (ClassType) c.type;
ctype.supertype_field = syms.objectType;