1.1 --- a/test/tools/javac/scope/HashCollisionTest.java Mon Feb 07 18:09:46 2011 +0000 1.2 +++ b/test/tools/javac/scope/HashCollisionTest.java Mon Feb 07 18:10:13 2011 +0000 1.3 @@ -47,7 +47,6 @@ 1.4 JavacFileManager.preRegister(context); // required by ClassReader which is required by Symtab 1.5 names = Names.instance(context); // Name.Table impls tied to an instance of Names 1.6 symtab = Symtab.instance(context); 1.7 - scopeCounter = ScopeCounter.instance(context); 1.8 1.9 // determine hashMask for an empty scope 1.10 Scope emptyScope = new Scope(symtab.unnamedPackage); // any owner will do 1.11 @@ -171,7 +170,7 @@ 1.12 */ 1.13 ClassSymbol createClass(Name name, Symbol owner) { 1.14 ClassSymbol sym = new ClassSymbol(0, name, owner); 1.15 - sym.members_field = new ClassScope(sym, scopeCounter); 1.16 + sym.members_field = new Scope(sym); 1.17 if (owner != symtab.unnamedPackage) 1.18 owner.members().enter(sym); 1.19 return sym; 1.20 @@ -247,5 +246,4 @@ 1.21 1.22 Names names; 1.23 Symtab symtab; 1.24 - ScopeCounter scopeCounter; 1.25 }