hg: anno-pipeline/dev/langtools: 2 new changesets

[joel.franck at oracle.com]

Changeset: 9d2192f36e53
Author:    jlahoda
Date:      2014-12-03 13:46 +0100
URL:       http://hg.openjdk.java.net/anno-pipeline/dev/langtools/rev/9d2192f36e53

7101822: Compiling depends on order of imports
7177813: Static import to local nested class fails
Summary: MemberEnter overhaul - TypeEnter is split out of MemberEnter; the TypeEnter consists of several Phases which ensure actions are done in the correct order.
Reviewed-by: mcimadamore, jfranck, aeremeev
Contributed-by: jan.lahoda at oracle.com, maurizio.cimadamore at oracle.com

! src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java
+ src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/util/Dependencies.java
+ test/tools/javac/4980495/std/NonStatic2StaticImportClash.java
+ test/tools/javac/4980495/std/NonStatic2StaticImportClash.out
+ test/tools/javac/4980495/std/Static2NonStaticImportClash.java
+ test/tools/javac/4980495/std/Static2NonStaticImportClash.out
! test/tools/javac/4980495/std/Test.out
! test/tools/javac/diags/examples/ImportRequiresCanonical/ImportRequiresCanonical.java
+ test/tools/javac/importChecks/NoImportedNoClasses.java
+ test/tools/javac/importChecks/NoImportedNoClasses.out
+ test/tools/javac/importscope/ImportResolvedTooSoon.java
+ test/tools/javac/importscope/T7101822A.java
+ test/tools/javac/importscope/T7101822Z.java
+ test/tools/javac/importscope/TestDuplicateImport.java
+ test/tools/javac/importscope/TestLazyImportScope.java
+ test/tools/javac/importscope/TypeParamCycle.java
+ test/tools/javac/importscope/TypeParamCycle2.java
+ test/tools/javac/importscope/TypeParamCycle3.java
+ test/tools/javac/importscope/dependencies/DependenciesTest.java
+ test/tools/javac/importscope/dependencies/annotations/Phase.java
+ test/tools/javac/importscope/dependencies/annotations/TriggersComplete.java
+ test/tools/javac/importscope/dependencies/annotations/TriggersCompleteRepeat.java
+ test/tools/javac/importscope/dependencies/tests/ImportResolvedTooSoon.java
+ test/tools/javac/importscope/dependencies/tests/Simple.java
+ test/tools/javac/importscope/dependencies/tests/T7101822/T7101822.java
+ test/tools/javac/importscope/dependencies/tests/T7101822/T7101822Aux.java
+ test/tools/javac/importscope/dependencies/tests/TypeParamCycle.java
+ test/tools/javac/importscope/dependencies/tests/TypeParamCycle2.java
+ test/tools/javac/importscope/dependencies/tests/TypeParamCycle3.java
! test/tools/javac/lib/DPrinter.java
! test/tools/javac/scope/HashCollisionTest.java
! test/tools/javac/scope/StarImportTest.java

Changeset: 3411b0655630
Author:    jfranck
Date:      2014-12-17 13:41 +0100
URL:       http://hg.openjdk.java.net/anno-pipeline/dev/langtools/rev/3411b0655630

Merge

! src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java
+ src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/util/Dependencies.java
! test/tools/javac/lib/DPrinter.java