hg: jdk8/jdk8/langtools: 7 new changesets

[lana.steuck at oracle.com]

Changeset: f5dbd6895994
Author:    jjh
Date:      2012-05-21 16:10 -0700
URL:       http://hg.openjdk.java.net/jdk8/jdk8/langtools/rev/f5dbd6895994

7157798: Add 6 test scenarios for testing inheritance of multiple same-name methods from mulitple interfaces
Reviewed-by: mcimadamore
Contributed-by: sue.wei at oracle.com

+ test/tools/javac/generics/rawOverride/7157798/Test1.java
+ test/tools/javac/generics/rawOverride/7157798/Test2.java
+ test/tools/javac/generics/rawOverride/7157798/Test3.java
+ test/tools/javac/generics/rawOverride/7157798/Test3.out
+ test/tools/javac/generics/rawOverride/7157798/Test4.java
+ test/tools/javac/generics/rawOverride/7157798/Test4.out

Changeset: f43aded513e7
Author:    lana
Date:      2012-05-25 16:32 -0700
URL:       http://hg.openjdk.java.net/jdk8/jdk8/langtools/rev/f43aded513e7

Merge


Changeset: af6a4c24f4e3
Author:    mcimadamore
Date:      2012-05-31 17:42 +0100
URL:       http://hg.openjdk.java.net/jdk8/jdk8/langtools/rev/af6a4c24f4e3

7166552: Inference: cleanup usage of Type.ForAll
Summary: Remove hack to callback into type-inference from assignment context
Reviewed-by: dlsmith, jjg

! src/share/classes/com/sun/tools/javac/code/Type.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/AttrContext.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/Infer.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! test/tools/javac/6758789/T6758789b.out
! test/tools/javac/diags/examples.not-yet.txt
! test/tools/javac/diags/examples/ApplicableMethodFound1.java
! test/tools/javac/diags/examples/CantApplyDiamond1.java
- test/tools/javac/diags/examples/FullInstSig.java
! test/tools/javac/diags/examples/IncompatibleTypes1.java
! test/tools/javac/diags/examples/InferredDoNotConformToLower.java
- test/tools/javac/diags/examples/InvalidInferredTypes.java
+ test/tools/javac/diags/examples/NoUniqueMaximalInstance.java
- test/tools/javac/diags/examples/UndeterminedType1.java
! test/tools/javac/diags/examples/WhereFreshTvar.java
! test/tools/javac/generics/7015430/T7015430.out
! test/tools/javac/generics/7151802/T7151802.out
! test/tools/javac/generics/inference/6315770/T6315770.out
! test/tools/javac/generics/inference/6638712/T6638712b.out
! test/tools/javac/generics/inference/6638712/T6638712e.out
! test/tools/javac/generics/inference/6650759/T6650759m.out
! test/tools/javac/generics/inference/7154127/T7154127.out
! test/tools/javac/varargs/6313164/T6313164.out

Changeset: 37dc15c68760
Author:    mcimadamore
Date:      2012-05-31 17:44 +0100
URL:       http://hg.openjdk.java.net/jdk8/jdk8/langtools/rev/37dc15c68760

7160084: javac fails to compile an apparently valid class/interface combination
Summary: javac generates wrong syntetized trees for nested enum constants
Reviewed-by: dlsmith, jjg

! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
! src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
+ test/tools/javac/enum/7160084/T7160084a.java
+ test/tools/javac/enum/7160084/T7160084b.java

Changeset: 844478076c25
Author:    jjh
Date:      2012-05-31 15:07 -0700
URL:       http://hg.openjdk.java.net/jdk8/jdk8/langtools/rev/844478076c25

7159016: Static import of member in processor-generated class fails in JDK 7
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
+ test/tools/javac/T7159016.java

Changeset: 252f8b7473e1
Author:    lana
Date:      2012-06-05 17:40 -0700
URL:       http://hg.openjdk.java.net/jdk8/jdk8/langtools/rev/252f8b7473e1

Merge


Changeset: e3d0a8fe4318
Author:    lana
Date:      2012-06-08 12:45 -0700
URL:       http://hg.openjdk.java.net/jdk8/jdk8/langtools/rev/e3d0a8fe4318

Merge

- test/tools/javac/diags/examples/FullInstSig.java
- test/tools/javac/diags/examples/InvalidInferredTypes.java
- test/tools/javac/diags/examples/UndeterminedType1.java