Mercurial > hg > openjdk > jdk7 > langtools

changeset 26:447c300a24e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6450290: Capture of nested wildcards causes type error Summary: A missing capture conversion makes javac to think that some expressions are well-formed even when they aren't Reviewed-by: jjg
author mcimadamore
date Wed, 09 Apr 2008 14:45:50 +0100
parents 25338c55e458
children e7bf2e39b8fe
files src/share/classes/com/sun/tools/javac/comp/Attr.java test/tools/javac/generics/wildcards/T6450290.java
diffstat 2 files changed, 48 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Wed Apr 09 14:05:24 2008 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Wed Apr 09 14:45:50 2008 +0100
@@ -1878,8 +1878,10 @@
         boolean varArgs = env.info.varArgs;
         tree.sym = sym;
 
-        if (site.tag == TYPEVAR && !isType(sym) && sym.kind != ERR)
-            site = capture(site.getUpperBound());
+        if (site.tag == TYPEVAR && !isType(sym) && sym.kind != ERR) {
+            while (site.tag == TYPEVAR) site = site.getUpperBound();
+            site = capture(site);
+        }
 
         // If that symbol is a variable, ...
         if (sym.kind == VAR) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/generics/wildcards/T6450290.java	Wed Apr 09 14:45:50 2008 +0100
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2004-2006 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 6450290
+ * @summary Capture of nested wildcards causes type error
+ * @author Maurizio Cimadamore
+ * @compile/fail T6450290.java
+ */
+
+public class T6450290 {
+    static class Box<X extends Box<?,?>, T extends X> {
+        T value;
+        Box<X, T> same;
+    }
+
+    static class A extends Box<A,A> {}
+    static class B extends Box<B,B> {}
+    public static void main(String[] args) {
+        Box<?,?> b = new Box<Box<A,A>,Box<A,A>>();
+        b.value.same = new Box<B,B>(); //javac misses this bad assignment
+    }
+}