1.1 --- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Thu Sep 16 09:57:37 2010 -0700 1.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Sat Sep 18 09:54:51 2010 -0700 1.3 @@ -122,6 +122,9 @@ 1.4 /** The symbol table. */ 1.5 Symtab syms; 1.6 1.7 + /** The scope counter */ 1.8 + Scope.ScopeCounter scopeCounter; 1.9 + 1.10 Types types; 1.11 1.12 /** The name table. */ 1.13 @@ -244,6 +247,7 @@ 1.14 1.15 names = Names.instance(context); 1.16 syms = Symtab.instance(context); 1.17 + scopeCounter = Scope.ScopeCounter.instance(context); 1.18 types = Types.instance(context); 1.19 fileManager = context.get(JavaFileManager.class); 1.20 if (fileManager == null) 1.21 @@ -1984,7 +1988,7 @@ 1.22 ClassType ct = (ClassType)c.type; 1.23 1.24 // allocate scope for members 1.25 - c.members_field = new Scope(c); 1.26 + c.members_field = new Scope.ClassScope(c, scopeCounter); 1.27 1.28 // prepare type variable table 1.29 typevars = typevars.dup(currentOwner);