7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123

Override clash algorithm is not implemented correctly

Reviewed-by: jjg
This commit is contained in:
Maurizio Cimadamore 2011-02-07 18:10:13 +00:00
parent 3c0d8e8275
commit dfec6e2301
37 changed files with 470 additions and 186 deletions

View file

@ -136,7 +136,6 @@ public class StarImportTest {
JavacFileManager.preRegister(context); // required by ClassReader which is required by Symtab
names = Names.instance(context); // Name.Table impls tied to an instance of Names
symtab = Symtab.instance(context);
scopeCounter = ScopeCounter.instance(context);
int setupCount = rgen.nextInt(MAX_SETUP_COUNT);
for (int i = 0; i < setupCount; i++) {
switch (random(SetupKind.values())) {
@ -303,7 +302,7 @@ public class StarImportTest {
ClassSymbol createClass(Name name, Symbol owner) {
ClassSymbol sym = new ClassSymbol(0, name, owner);
sym.members_field = new ClassScope(sym, scopeCounter);
sym.members_field = new Scope(sym);
if (owner != symtab.unnamedPackage)
owner.members().enter(sym);
return sym;
@ -311,7 +310,6 @@ public class StarImportTest {
Context context;
Symtab symtab;
ScopeCounter scopeCounter;
Names names;
int nextNameSerial;
List<PackageSymbol> packages = new ArrayList<PackageSymbol>();