hg: jdk7/tl/langtools: 2 new changesets

[maurizio.cimadamore at sun.com]

Changeset: 396b117c1743
Author:    mcimadamore
Date:      2010-04-14 12:23 +0100
URL:       http://hg.openjdk.java.net/jdk7/tl/langtools/rev/396b117c1743

6939618: Revert 'simple' diamond implementation
Summary: backout changeset for 6840638
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Source.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
- test/tools/javac/generics/diamond/neg/Neg01.java
- test/tools/javac/generics/diamond/neg/Neg01.out
- test/tools/javac/generics/diamond/neg/Neg02.java
- test/tools/javac/generics/diamond/neg/Neg02.out
- test/tools/javac/generics/diamond/neg/Neg03.java
- test/tools/javac/generics/diamond/neg/Neg03.out
- test/tools/javac/generics/diamond/neg/Neg04.java
- test/tools/javac/generics/diamond/neg/Neg04.out
- test/tools/javac/generics/diamond/neg/Neg05.java
- test/tools/javac/generics/diamond/neg/Neg05.out
- test/tools/javac/generics/diamond/pos/Pos01.java
- test/tools/javac/generics/diamond/pos/Pos02.java
- test/tools/javac/generics/diamond/pos/Pos03.java
- test/tools/javac/generics/diamond/pos/Pos04.java
! test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java
! test/tools/javac/processing/model/element/TestAnonClassNames.java

Changeset: 9d9d08922405
Author:    mcimadamore
Date:      2010-04-14 12:31 +0100
URL:       http://hg.openjdk.java.net/jdk7/tl/langtools/rev/9d9d08922405

6939620: Switch to 'complex' diamond inference scheme
Summary: Implement new inference scheme for diamond operator that takes into account type of actual arguments supplied to constructor
Reviewed-by: jjg, darcy

! src/share/classes/com/sun/tools/javac/code/Source.java
! src/share/classes/com/sun/tools/javac/code/Symbol.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
! test/tools/javac/6840059/T6840059.out
+ test/tools/javac/generics/diamond/neg/Neg01.java
+ test/tools/javac/generics/diamond/neg/Neg01.out
+ test/tools/javac/generics/diamond/neg/Neg02.java
+ test/tools/javac/generics/diamond/neg/Neg02.out
+ test/tools/javac/generics/diamond/neg/Neg03.java
+ test/tools/javac/generics/diamond/neg/Neg03.out
+ test/tools/javac/generics/diamond/neg/Neg04.java
+ test/tools/javac/generics/diamond/neg/Neg04.out
+ test/tools/javac/generics/diamond/neg/Neg05.java
+ test/tools/javac/generics/diamond/neg/Neg05.out
+ test/tools/javac/generics/diamond/neg/Neg06.java
+ test/tools/javac/generics/diamond/neg/Neg06.out
+ test/tools/javac/generics/diamond/neg/Neg07.java
+ test/tools/javac/generics/diamond/neg/Neg07.out
+ test/tools/javac/generics/diamond/neg/Neg08.java
+ test/tools/javac/generics/diamond/neg/Neg08.out
+ test/tools/javac/generics/diamond/neg/Neg09.java
+ test/tools/javac/generics/diamond/neg/Neg09.out
+ test/tools/javac/generics/diamond/neg/Neg10.java
+ test/tools/javac/generics/diamond/neg/Neg10.out
+ test/tools/javac/generics/diamond/neg/Neg11.java
+ test/tools/javac/generics/diamond/neg/Neg11.out
+ test/tools/javac/generics/diamond/pos/Pos01.java
+ test/tools/javac/generics/diamond/pos/Pos02.java
+ test/tools/javac/generics/diamond/pos/Pos03.java
+ test/tools/javac/generics/diamond/pos/Pos04.java
+ test/tools/javac/generics/diamond/pos/Pos05.java