stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6738538: javac crashes when using a type parameter as a covariant method return type

Browse Source 
Capture conversion should be applied when acccessing a member of an intersection type

Reviewed-by: jjg
This commit is contained in:
Maurizio Cimadamore 2008-10-09 16:02:29 +01:00
parent 9315b88d67
commit 67339c0aab
3 changed files with 95 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
langtools/src/share/classes/com/sun/tools/javac/code/Types.java
View File

@ -1430,6 +1430,10 @@ public class Types {
long flags = sym.flags();
if (((flags & STATIC) == 0) && owner.type.isParameterized()) {
Type base = asOuterSuper(t, owner);
//if t is an intersection type T = CT & I1 & I2 ... & In
//its supertypes CT, I1, ... In might contain wildcards
//so we need to go through capture conversion
base = t.isCompound() ? capture(base) : base;
if (base != null) {
List<Type> ownerParams = owner.type.allparams();
List<Type> baseParams = base.allparams();

44
langtools/test/tools/javac/OverrideChecks/6738538/T6738538a.java Normal file
View File

@ -0,0 +1,44 @@
/*
* 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 6738538 6687444
* @summary javac crashes when using a type parameter as a covariant method return type
* @author Maurizio Cimadamore
*
* @compile T6738538a.java
*/
class T6738538a {
class C<T> {
public T m(){
return null;
}
}
interface I<T>{
public T m();
}
class Crash<T extends C<?> & I> {}
}

47
langtools/test/tools/javac/OverrideChecks/6738538/T6738538b.java Normal file
View File

@ -0,0 +1,47 @@
/*
* 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 6738538 6687444
* @summary javac crashes when using a type parameter as a covariant method return type
* @author Maurizio Cimadamore
*
* @compile T6738538b.java
*/
class T6738538b {
interface I1 {
Object m();
}
interface I2 {}
class C1<T> implements I1 {
public T m() {
return null;
}
}
class C2<T extends C1<?> & I2> {}
}