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

8034147: javac crashes with a NullPointerException during bounds checking

Browse Source 
Types.supertype should return Type.noType rather than null

Reviewed-by: vromero, mcimadamore
This commit is contained in:
Dan Smith 2014-06-20 10:56:31 -06:00
parent d7c001dd04
commit 06b8a7ac80
3 changed files with 38 additions and 3 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

@ -2315,7 +2315,7 @@ public class Types {
public Type visitType(Type t, Void ignored) {
// A note on wildcards: there is no good way to
// determine a supertype for a super bounded wildcard.
return null;
return Type.noType;
}
@Override
@ -2482,7 +2482,7 @@ public class Types {
return false;
return
t.isRaw() ||
supertype(t) != null && isDerivedRaw(supertype(t)) ||
supertype(t) != Type.noType && isDerivedRaw(supertype(t)) ||
isDerivedRaw(interfaces(t));
}

2
langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
View File

@ -2684,7 +2684,7 @@ public class Check {
checkClassBounds(pos, seensofar, it);
}
Type st = types.supertype(type);
if (st != null) checkClassBounds(pos, seensofar, st);
if (st != Type.noType) checkClassBounds(pos, seensofar, st);
}
/** Enter interface into into set.

35
langtools/test/tools/javac/generics/wildcards/T8034147.java Normal file
View File

@ -0,0 +1,35 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8034147
* @summary javac crashes with a NullPointerException during bounds checking
* @compile T8034147.java
*/
class T8034147 {
static class One<X extends Two<? super X>> {}
static class Two<Y extends Three<? extends Y>> implements Three<Y> {}
interface Three<Z> {}
}