archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7101822: Compiling depends on order of imports

Browse source 
7177813: Static import to local nested class fails

MemberEnter overhaul - TypeEnter is split out of MemberEnter; the TypeEnter consists of several Phases which ensure actions are done in the correct order.

Co-authored-by: Maurizio Cimadamore <maurizio.cimadamore@oracle.com>
Reviewed-by: mcimadamore, jfranck, aeremeev
This commit is contained in:
Jan Lahoda 2014-12-03 13:46:12 +01:00
parent 02df6a4564
commit d739446063
39 changed files with 2756 additions and 1078 deletions
Download patch file Download diff file Expand all files Collapse all files

6
langtools/test/tools/javac/scope/StarImportTest.java
View file

@ -135,6 +135,7 @@ 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);
types = Types.instance(context);
int setupCount = rgen.nextInt(MAX_SETUP_COUNT);
for (int i = 0; i < setupCount; i++) {
switch (random(SetupKind.values())) {
@ -204,7 +205,7 @@ public class StarImportTest {
}
/**
* Create a star-import scope and a model therof, from the packages and
* Create a star-import scope and a model thereof, from the packages and
* classes created by setupPackages and setupClasses.
* @throws Exception for fatal errors, such as from reflection
*/
@ -218,7 +219,7 @@ public class StarImportTest {
for (Symbol imp: imports) {
Scope members = imp.members();
// log("importAll", members);
starImportScope.importAll(members, members, new ImportFilter() {
starImportScope.importAll(types, members, new ImportFilter() {
@Override
public boolean accepts(Scope origin, Symbol t) {
return t.kind == TYP;
@ -292,6 +293,7 @@ public class StarImportTest {
Context context;
Symtab symtab;
Names names;
Types types;
int nextNameSerial;
List<PackageSymbol> packages = new ArrayList<PackageSymbol>();
int nextPackageSerial;