# HG changeset patch # User mcimadamore # Date 1212140563 -3600 # Node ID 16c478b6af1d8d97121c43f91192c3cf0e4c4ce0 # Parent 34b10b15401502927ff1ccac6ac7d530bd44ef27 6507024: casting an array to a generic type results in a 'capture#69 of ?' type error Summary: Types.isSubtypeUnchecked() should handle type-variables subtyping properly Reviewed-by: jjg diff -r 34b10b154015 -r 16c478b6af1d langtools/src/share/classes/com/sun/tools/javac/code/Types.java --- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Fri May 30 10:29:27 2008 +0100 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Fri May 30 10:42:43 2008 +0100 @@ -301,7 +301,11 @@ : isSubtypeUnchecked(elemtype(t), elemtype(s), warn); } else if (isSubtype(t, s)) { return true; - } else if (!s.isRaw()) { + } + else if (t.tag == TYPEVAR) { + return isSubtypeUnchecked(t.getUpperBound(), s, warn); + } + else if (!s.isRaw()) { Type t2 = asSuper(t, s.tsym); if (t2 != null && t2.isRaw()) { if (isReifiable(s)) diff -r 34b10b154015 -r 16c478b6af1d langtools/test/tools/javac/generics/T6507024.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/generics/T6507024.java Fri May 30 10:42:43 2008 +0100 @@ -0,0 +1,37 @@ +/* + * 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 6507024 + * @summary unchecked conversion between arrays fails after capture conversion + * @author Maurizio Cimadamore + * + * @compile T6507024.java + */ + +public class T6507024 { + void m(T6507024[] results) { + T6507024[] r = results.getClass().cast(null); + } +}