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

8025816: javac crash with method reference with a type variable as the site

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Vicente Romero 2013-10-15 19:36:45 +01:00
parent 99e02c21cd
commit 53cc43916a
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
View File

@ -424,13 +424,14 @@ public class Resolve {
*/ */
private private
boolean isProtectedAccessible(Symbol sym, ClassSymbol c, Type site) { boolean isProtectedAccessible(Symbol sym, ClassSymbol c, Type site) {
Type newSite = site.hasTag(TYPEVAR) ? site.getUpperBound() : site;
while (c != null && while (c != null &&
!(c.isSubClass(sym.owner, types) && !(c.isSubClass(sym.owner, types) &&
(c.flags() & INTERFACE) == 0 && (c.flags() & INTERFACE) == 0 &&
// In JLS 2e 6.6.2.1, the subclass restriction applies // In JLS 2e 6.6.2.1, the subclass restriction applies
// only to instance fields and methods -- types are excluded // only to instance fields and methods -- types are excluded
// regardless of whether they are declared 'static' or not. // regardless of whether they are declared 'static' or not.
((sym.flags() & STATIC) != 0 || sym.kind == TYP || site.tsym.isSubClass(c, types)))) ((sym.flags() & STATIC) != 0 || sym.kind == TYP || newSite.tsym.isSubClass(c, types))))
c = c.owner.enclClass(); c = c.owner.enclClass();
return c != null; return c != null;
} }
@ -2710,11 +2711,6 @@ public class Resolve {
InferenceContext inferenceContext) { InferenceContext inferenceContext) {
MethodResolutionPhase maxPhase = boxingAllowed ? VARARITY : BASIC; MethodResolutionPhase maxPhase = boxingAllowed ? VARARITY : BASIC;
if (site.hasTag(TYPEVAR)) {
return resolveMemberReference(pos, env, referenceTree, site.getUpperBound(),
name, argtypes, typeargtypes, boxingAllowed, methodCheck, inferenceContext);
}
site = types.capture(site); site = types.capture(site);
ReferenceLookupHelper boundLookupHelper; ReferenceLookupHelper boundLookupHelper;

40
langtools/test/tools/javac/lambda/T8025816/CrashMethodReferenceWithSiteTypeVarTest.java Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright (c) 2013, 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 8025816
* @summary Compiler crash when default method call with method reference
* @compile CrashMethodReferenceWithSiteTypeVarTest.java
*/
import java.util.Collection;
import java.util.Comparator;
public class CrashMethodReferenceWithSiteTypeVarTest {
public <T> void m1(Collection<T> c, Comparator<T> comp) {}
public <T extends Comparable> void m2(Collection<T> c) {
m1(c, T::compareTo);
}
}