Fri, 23 May 2014 16:27:22 +0100
8033437: javac, inconsistent generic types behaviour when compiling together vs. separate
Reviewed-by: jjg
Contributed-by: vicente.romero@oracle.com, paul.govereau@oracle.com
1.1 --- a/src/share/classes/com/sun/tools/javac/code/Types.java Wed May 14 15:41:28 2014 -0600 1.2 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java Fri May 23 16:27:22 2014 +0100 1.3 @@ -3972,8 +3972,13 @@ 1.4 Si.lower = Ti.getSuperBound(); 1.5 break; 1.6 } 1.7 - if (Si.bound == Si.lower) 1.8 + Type tmpBound = Si.bound.hasTag(UNDETVAR) ? ((UndetVar)Si.bound).qtype : Si.bound; 1.9 + Type tmpLower = Si.lower.hasTag(UNDETVAR) ? ((UndetVar)Si.lower).qtype : Si.lower; 1.10 + if (!Si.bound.hasTag(ERROR) && 1.11 + !Si.lower.hasTag(ERROR) && 1.12 + isSameType(tmpBound, tmpLower, false)) { 1.13 currentS.head = Si.bound; 1.14 + } 1.15 } 1.16 currentA = currentA.tail; 1.17 currentT = currentT.tail;
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/test/tools/javac/generics/wildcards/RefQueue.java Fri May 23 16:27:22 2014 +0100 2.3 @@ -0,0 +1,24 @@ 2.4 +/* 2.5 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. 2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.7 + * 2.8 + * This code is free software; you can redistribute it and/or modify it 2.9 + * under the terms of the GNU General Public License version 2 only, as 2.10 + * published by the Free Software Foundation. 2.11 + * 2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 2.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 2.15 + * version 2 for more details (a copy is included in the LICENSE file that 2.16 + * accompanied this code). 2.17 + * 2.18 + * You should have received a copy of the GNU General Public License version 2.19 + * 2 along with this work; if not, write to the Free Software Foundation, 2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 2.21 + * 2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 2.23 + * or visit www.oracle.com if you need additional information or have any 2.24 + * questions. 2.25 + */ 2.26 + 2.27 +public class RefQueue<S> { }
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/test/tools/javac/generics/wildcards/RefQueueBug.java Fri May 23 16:27:22 2014 +0100 3.3 @@ -0,0 +1,38 @@ 3.4 +/* 3.5 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. 3.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.7 + * 3.8 + * This code is free software; you can redistribute it and/or modify it 3.9 + * under the terms of the GNU General Public License version 2 only, as 3.10 + * published by the Free Software Foundation. 3.11 + * 3.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 3.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 3.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 3.15 + * version 2 for more details (a copy is included in the LICENSE file that 3.16 + * accompanied this code). 3.17 + * 3.18 + * You should have received a copy of the GNU General Public License version 3.19 + * 2 along with this work; if not, write to the Free Software Foundation, 3.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 3.21 + * 3.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 3.23 + * or visit www.oracle.com if you need additional information or have any 3.24 + * questions. 3.25 + */ 3.26 + 3.27 +/* 3.28 + * @test 3.29 + * @bug 8033437 3.30 + * @summary inconsistent generic types behaviour when compiling together vs. separate 3.31 + * @compile RefQueue.java 3.32 + * @compile RefQueueBug.java 3.33 + */ 3.34 + 3.35 +public class RefQueueBug<T> { 3.36 + final RefQueue<? super T> queue = new RefQueue<>(); 3.37 + public static void main(String[] args) { 3.38 + RefQueueBug<Object> r = new RefQueueBug<>(); 3.39 + RefQueue<Object> q = r.queue; 3.40 + } 3.41 +}