OpenJDK / amber / amber
changeset 1044:7016e624ec3a
6718364: inference fails when a generic method is invoked with raw arguments
Summary: Bug in the implementation of Types.isSubtypeUnchecked
Reviewed-by: jjg
author | mcimadamore |
---|---|
date | Fri, 08 Aug 2008 17:38:20 +0100 |
parents | 11ea4773b0af |
children | 56f6e84f7825 |
files | langtools/src/share/classes/com/sun/tools/javac/code/Types.java langtools/test/tools/javac/generics/inference/6718364/T6718364.java langtools/test/tools/javac/generics/inference/6718364/T6718364.out |
diffstat | 3 files changed, 46 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Fri Aug 08 15:16:25 2008 +0100 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Fri Aug 08 17:38:20 2008 +0100 @@ -305,6 +305,11 @@ else if (t.tag == TYPEVAR) { return isSubtypeUnchecked(t.getUpperBound(), s, warn); } + else if (s.tag == UNDETVAR) { + UndetVar uv = (UndetVar)s; + if (uv.inst != null) + return isSubtypeUnchecked(t, uv.inst, warn); + } else if (!s.isRaw()) { Type t2 = asSuper(t, s.tsym); if (t2 != null && t2.isRaw()) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/generics/inference/6718364/T6718364.java Fri Aug 08 17:38:20 2008 +0100 @@ -0,0 +1,38 @@ +/* + * 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 6718364 + * @summary inference fails when a generic method is invoked with raw arguments + * @compile/ref=T6718364.out -XDstdout -XDrawDiagnostics -Xlint:unchecked T6718364.java + */ +class T6718364 { + class X<T> {} + + public <T> void m(X<T> x, T t) {} + + public void test() { + m(new X<X<Integer>>(), new X()); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/generics/inference/6718364/T6718364.out Fri Aug 08 17:38:20 2008 +0100 @@ -0,0 +1,3 @@ +T6718364.java:36:32: compiler.warn.prob.found.req: (- compiler.misc.unchecked.assign), T6718364.X, T6718364.X<java.lang.Integer> +T6718364.java:36:10: compiler.warn.unchecked.meth.invocation.applied: <T>m(T6718364.X<T>,T), T6718364, , T6718364.X<T6718364.X<java.lang.Integer>>,T6718364.X +2 warnings \ No newline at end of file