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

8205052: No compilation error thrown when no valid parameterization exists for functional interface type

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Vicente Romero 2018-06-19 05:22:07 -07:00
parent ebe240f3f4
commit 58f944b75e
3 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
View File

@ -676,10 +676,21 @@ public class Types {
public Type getType(Type site) {
site = removeWildcards(site);
if (!chk.checkValidGenericType(site)) {
//if the inferred functional interface type is not well-formed,
//or if it's not a subtype of the original target, issue an error
throw failure(diags.fragment(Fragments.NoSuitableFunctionalIntfInst(site)));
if (site.isIntersection()) {
IntersectionClassType ict = (IntersectionClassType)site;
for (Type component : ict.getExplicitComponents()) {
if (!chk.checkValidGenericType(component)) {
//if the inferred functional interface type is not well-formed,
//or if it's not a subtype of the original target, issue an error
throw failure(diags.fragment(Fragments.NoSuitableFunctionalIntfInst(site)));
}
}
} else {
if (!chk.checkValidGenericType(site)) {
//if the inferred functional interface type is not well-formed,
//or if it's not a subtype of the original target, issue an error
throw failure(diags.fragment(Fragments.NoSuitableFunctionalIntfInst(site)));
}
}
return memberType(site, descSym);
}

32
test/langtools/tools/javac/T8203338/CheckWellFormednessIntersectionTypesTest.java Normal file
View File

@ -0,0 +1,32 @@
/*
* @test /nodynamiccopyright/
* @bug 8203338
* @summary Unboxing in return from lambda miscompiled to throw ClassCastException
* @compile/fail/ref=CheckWellFormednessIntersectionTypesTest.out -XDrawDiagnostics CheckWellFormednessIntersectionTypesTest.java
*/
public class CheckWellFormednessIntersectionTypesTest {
class U1 {}
class U3 {}
class X1 extends U1 {}
class X3 extends U3 {}
interface SAM<P1 extends X1, P2 extends P1, P3 extends X3> {
P3 m(P1 p1, P2 p2);
}
interface I<T> {}
@SuppressWarnings("unchecked")
class Tester {
public X3 foo(X1 x1, Object x2) { return new X3(); }
Object method(SAM<?, ?, ?> sam) {
return sam.m(null, null);
}
Object foo() {
return method((SAM<?, ?, ?> & I<?>) this::foo);
}
}
}

2
test/langtools/tools/javac/T8203338/CheckWellFormednessIntersectionTypesTest.out Normal file
View File

@ -0,0 +1,2 @@
CheckWellFormednessIntersectionTypesTest.java:29:49: compiler.err.prob.found.req: (compiler.misc.no.suitable.functional.intf.inst: java.lang.Object&CheckWellFormednessIntersectionTypesTest.SAM<CheckWellFormednessIntersectionTypesTest.X1,java.lang.Object,CheckWellFormednessIntersectionTypesTest.X3>&CheckWellFormednessIntersectionTypesTest.I<java.lang.Object>)
1 error