hg: jdk7/tl/langtools: 2 new changesets

[maurizio.cimadamore at oracle.com]

Changeset: f00986f55961
Author:    mcimadamore
Date:      2011-04-12 20:56 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/langtools/rev/f00986f55961

7034511: Loophole in typesafety
Summary: Type-variable substutution takes upper bound of replaced captured type-variable
Reviewed-by: dlsmith

! src/share/classes/com/sun/tools/javac/code/Types.java
+ test/tools/javac/generics/7034511/T7034511a.java
+ test/tools/javac/generics/7034511/T7034511a.out
+ test/tools/javac/generics/7034511/T7034511b.java
+ test/tools/javac/generics/7034511/T7034511b.out

Changeset: bfbc197b560f
Author:    mcimadamore
Date:      2011-04-12 20:58 -0700
URL:       http://hg.openjdk.java.net/jdk7/tl/langtools/rev/bfbc197b560f

7034019: ClassCastException in javac with conjunction types
Summary: Resolve.mostSpecific doesn't handle case of raw override
Reviewed-by: dlsmith

! src/share/classes/com/sun/tools/javac/comp/Resolve.java
+ test/tools/javac/generics/7034019/T7034019a.java
+ test/tools/javac/generics/7034019/T7034019b.java
+ test/tools/javac/generics/7034019/T7034019c.java
+ test/tools/javac/generics/7034019/T7034019c.out
+ test/tools/javac/generics/7034019/T7034019d.java
+ test/tools/javac/generics/7034019/T7034019d.out