archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-19 02:24:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8057800: Method reference with generic type creates NPE when compiling

Browse source 
Reviewed-by: mcimadamore, dlsmith
This commit is contained in:
Vicente Romero 2014-10-23 10:42:44 -07:00
parent 503cf15f62
commit 96941c8951
3 changed files with 45 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
View file

@ -3634,7 +3634,8 @@ public class Types {
for (Type erasedSupertype : mec) {
List<Type> lci = List.of(asSuper(ts[startIdx], erasedSupertype.tsym));
for (int i = startIdx + 1 ; i < ts.length ; i++) {
lci = intersect(lci, List.of(asSuper(ts[i], erasedSupertype.tsym)));
Type superType = asSuper(ts[i], erasedSupertype.tsym);
lci = intersect(lci, superType != null ? List.of(superType) : List.<Type>nil());
}
candidates = candidates.appendList(lci);
}

5
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
View file

@ -866,7 +866,10 @@ public class Infer {
while (tmpTail.nonEmpty()) {
Type b1 = boundList.head;
Type b2 = tmpTail.head;
if (b1 != b2) {
/* This wildcard check is temporary workaround. This code may need to be
* revisited once spec bug JDK-7034922 is fixed.
*/
if (b1 != b2 && !b1.hasTag(WILDCARD) && !b2.hasTag(WILDCARD)) {
for (Pair<Type, Type> commonSupers : infer.getParameterizedSupers(b1, b2)) {
List<Type> allParamsSuperBound1 = commonSupers.fst.allparams();
List<Type> allParamsSuperBound2 = commonSupers.snd.allparams();

39
langtools/test/tools/javac/lambda/T8057800/NPEMethodReferenceAndGenericsTest.java Normal file
View file

@ -0,0 +1,39 @@
/*
* 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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 8057800
* @summary Method reference with generic type creates NPE when compiling
* @compile NPEMethodReferenceAndGenericsTest.java
*/
public class NPEMethodReferenceAndGenericsTest {
public <T> void foo(java.util.Comparator<? super T> comparator) {}
public <C extends Comparable<? super C>> void foo() {
foo(C::compareTo);
}
}