--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Thu Sep 16 09:57:37 2010 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Sat Sep 18 09:54:51 2010 -0700
@@ -68,6 +68,7 @@
private Names names;
private Log log;
private Symtab syms;
+ private Scope.ScopeCounter scopeCounter;
private Resolve rs;
private Check chk;
private Attr attr;
@@ -90,6 +91,7 @@
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);
@@ -569,7 +571,7 @@
c.flatname = chk.localClassName(c);
c.sourcefile = owner.sourcefile;
c.completer = null;
- c.members_field = new Scope(c);
+ c.members_field = new Scope.ClassScope(c, scopeCounter);
c.flags_field = flags;
ClassType ctype = (ClassType) c.type;
ctype.supertype_field = syms.objectType;