6531075: Missing synthetic casts when accessing fields/methods of intersection types including type variables
Bug when javac generates code involving intersection types Reviewed-by: jjg
This commit is contained in:
parent
f62ccad5cd
commit
2daecbb697
@ -690,13 +690,15 @@ public class TransTypes extends TreeTranslator {
|
||||
|
||||
public void visitSelect(JCFieldAccess tree) {
|
||||
Type t = tree.selected.type;
|
||||
if (t.isCompound() || (t.tag == TYPEVAR && t.getUpperBound().isCompound())) {
|
||||
while (t.tag == TYPEVAR)
|
||||
t = t.getUpperBound();
|
||||
if (t.isCompound()) {
|
||||
if ((tree.sym.flags() & IPROXY) != 0) {
|
||||
tree.sym = ((MethodSymbol)tree.sym).
|
||||
implemented((TypeSymbol)tree.sym.owner, types);
|
||||
}
|
||||
tree.selected = cast(
|
||||
translate(tree.selected, erasure(t)),
|
||||
translate(tree.selected, erasure(tree.selected.type)),
|
||||
erasure(tree.sym.owner.type));
|
||||
} else
|
||||
tree.selected = translate(tree.selected, erasure(t));
|
||||
|
66
langtools/test/tools/javac/generics/6531075/T6531075.java
Normal file
66
langtools/test/tools/javac/generics/6531075/T6531075.java
Normal file
@ -0,0 +1,66 @@
|
||||
/*
|
||||
* Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 6531075
|
||||
*
|
||||
* @summary Missing synthetic casts when accessing fields/methods of intersection types including type variables
|
||||
* @author Maurizio Cimadamore
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
public class T6531075 {
|
||||
|
||||
static class A {
|
||||
void a() {}
|
||||
}
|
||||
|
||||
static interface I{
|
||||
void i();
|
||||
}
|
||||
|
||||
static class E extends A implements I{
|
||||
public void i() {}
|
||||
}
|
||||
|
||||
static class C<W extends A & I, T extends W>{
|
||||
T t;
|
||||
W w;
|
||||
C(W w, T t) {
|
||||
this.w = w;
|
||||
this.t = t;
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String... args) {
|
||||
C<E,E> c = new C<E,E>(new E(), new E());
|
||||
testMemberMethods(c);
|
||||
}
|
||||
|
||||
static void testMemberMethods(C<?, ?> arg) {
|
||||
arg.t.a();
|
||||
arg.t.i();
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user