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

8004102: Add support for generic functional descriptors

Browse Source 
Method references are allowed to have a generic functional interface descriptor target

Reviewed-by: jjg
This commit is contained in:
Maurizio Cimadamore 2012-11-30 15:14:25 +00:00
parent 684271da34
commit 0db60b7bb2
8 changed files with 162 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -437,23 +437,8 @@ public class Types {
throw failure("not.a.functional.intf.1",
diags.fragment("no.abstracts", Kinds.kindName(origin), origin));
} else if (abstracts.size() == 1) {
if (abstracts.first().type.tag == FORALL) {
throw failure("invalid.generic.desc.in.functional.intf",
abstracts.first(),
Kinds.kindName(origin),
origin);
} else {
return new FunctionDescriptor(abstracts.first());
}
return new FunctionDescriptor(abstracts.first());
} else { // size > 1
for (Symbol msym : abstracts) {
if (msym.type.tag == FORALL) {
throw failure("invalid.generic.desc.in.functional.intf",
abstracts.first(),
Kinds.kindName(origin),
origin);
}
}
FunctionDescriptor descRes = mergeDescriptors(origin, abstracts.toList());
if (descRes == null) {
//we can get here if the functional interface is ill-formed

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

@ -2204,6 +2204,14 @@ public class Attr extends JCTree.Visitor {
lambdaType = fallbackDescriptorType(that);
}
if (lambdaType.hasTag(FORALL)) {
//lambda expression target desc cannot be a generic method
resultInfo.checkContext.report(that, diags.fragment("invalid.generic.lambda.target",
lambdaType, kindName(target.tsym), target.tsym));
result = that.type = types.createErrorType(pt());
return;
}
if (!TreeInfo.isExplicitLambda(that)) {
//add param type info in the AST
List<Type> actuals = lambdaType.getParameterTypes();

5
langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
View File

@ -187,8 +187,9 @@ compiler.misc.not.a.functional.intf.1=\
{0}
# 0: symbol, 1: symbol kind, 2: symbol
compiler.misc.invalid.generic.desc.in.functional.intf=\
invalid functional descriptor: method {0} in {1} {2} is generic
compiler.misc.invalid.generic.lambda.target=\
invalid functional descriptor for lambda expression\n\
method {0} in {1} {2} is generic
# 0: symbol kind, 1: symbol
compiler.misc.incompatible.descs.in.functional.intf=\

4
langtools/test/tools/javac/diags/examples/InvalidGenericDescInFunctionalInterface.java → langtools/test/tools/javac/diags/examples/InvalidGenericLambdaTarget.java
View File

@ -22,9 +22,9 @@
*/
// key: compiler.err.prob.found.req
// key: compiler.misc.invalid.generic.desc.in.functional.intf
// key: compiler.misc.invalid.generic.lambda.target
class InvalidGenericDescInFunctionalIntf {
class InvalidGenericLambdaTarget {
interface SAM {
<Z> void m();

84
langtools/test/tools/javac/lambda/LambdaConversionTest.java → langtools/test/tools/javac/lambda/FunctionalInterfaceConversionTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 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
@ -23,11 +23,11 @@
/**
* @test
* @bug 8003280
* @bug 8003280 8004102
* @summary Add lambda tests
* perform several automated checks in lambda conversion, esp. around accessibility
* @author Maurizio Cimadamore
* @run main LambdaConversionTest
* @run main FunctionalInterfaceConversionTest
*/
import com.sun.source.util.JavacTask;
@ -37,9 +37,10 @@ import javax.tools.Diagnostic;
import javax.tools.JavaCompiler;
import javax.tools.JavaFileObject;
import javax.tools.SimpleJavaFileObject;
import javax.tools.StandardJavaFileManager;
import javax.tools.ToolProvider;
public class LambdaConversionTest {
public class FunctionalInterfaceConversionTest {
enum PackageKind {
NO_PKG(""),
@ -108,10 +109,21 @@ public class LambdaConversionTest {
}
}
enum ExprKind {
LAMBDA("x -> null"),
MREF("this::m");
String exprStr;
private ExprKind(String exprStr) {
this.exprStr = exprStr;
}
}
enum MethodKind {
NONE(""),
NON_GENERIC("public #R m(#ARG s) throws #T;"),
GENERIC("public <X> #R m(#ARG s) throws #T;");
NON_GENERIC("public abstract #R m(#ARG s) throws #T;"),
GENERIC("public abstract <X> #R m(#ARG s) throws #T;");
String methodTemplate;
@ -127,15 +139,21 @@ public class LambdaConversionTest {
}
public static void main(String[] args) throws Exception {
final JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null);
for (PackageKind samPkg : PackageKind.values()) {
for (ModifierKind modKind : ModifierKind.values()) {
for (SamKind samKind : SamKind.values()) {
for (MethodKind meth : MethodKind.values()) {
for (TypeKind retType : TypeKind.values()) {
for (TypeKind argType : TypeKind.values()) {
for (TypeKind thrownType : TypeKind.values()) {
new LambdaConversionTest(samPkg, modKind, samKind,
meth, retType, argType, thrownType).test();
for (MethodKind samMeth : MethodKind.values()) {
for (MethodKind clientMeth : MethodKind.values()) {
for (TypeKind retType : TypeKind.values()) {
for (TypeKind argType : TypeKind.values()) {
for (TypeKind thrownType : TypeKind.values()) {
for (ExprKind exprKind : ExprKind.values()) {
new FunctionalInterfaceConversionTest(samPkg, modKind, samKind,
samMeth, clientMeth, retType, argType, thrownType, exprKind).test(comp, fm);
}
}
}
}
}
@ -148,15 +166,18 @@ public class LambdaConversionTest {
PackageKind samPkg;
ModifierKind modKind;
SamKind samKind;
MethodKind meth;
MethodKind samMeth;
MethodKind clientMeth;
TypeKind retType;
TypeKind argType;
TypeKind thrownType;
ExprKind exprKind;
DiagnosticChecker dc;
SourceFile samSourceFile = new SourceFile("Sam.java", "#P \n #C") {
public String toString() {
return template.replaceAll("#P", samPkg.getPkgDecl()).
replaceAll("#C", samKind.getSam(meth.getMethod(retType, argType, thrownType)));
replaceAll("#C", samKind.getSam(samMeth.getMethod(retType, argType, thrownType)));
}
};
@ -169,27 +190,33 @@ public class LambdaConversionTest {
};
SourceFile clientSourceFile = new SourceFile("Client.java",
"#I\n class Client { Sam s = x -> null; }") {
"#I\n abstract class Client { \n" +
" Sam s = #E;\n" +
" #M \n }") {
public String toString() {
return template.replaceAll("#I", samPkg.getImportStat());
return template.replaceAll("#I", samPkg.getImportStat())
.replaceAll("#E", exprKind.exprStr)
.replaceAll("#M", clientMeth.getMethod(retType, argType, thrownType));
}
};
LambdaConversionTest(PackageKind samPkg, ModifierKind modKind, SamKind samKind,
MethodKind meth, TypeKind retType, TypeKind argType, TypeKind thrownType) {
FunctionalInterfaceConversionTest(PackageKind samPkg, ModifierKind modKind, SamKind samKind,
MethodKind samMeth, MethodKind clientMeth, TypeKind retType, TypeKind argType,
TypeKind thrownType, ExprKind exprKind) {
this.samPkg = samPkg;
this.modKind = modKind;
this.samKind = samKind;
this.meth = meth;
this.samMeth = samMeth;
this.clientMeth = clientMeth;
this.retType = retType;
this.argType = argType;
this.thrownType = thrownType;
this.exprKind = exprKind;
this.dc = new DiagnosticChecker();
}
void test() throws Exception {
final JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
DiagnosticChecker dc = new DiagnosticChecker();
JavacTask ct = (JavacTask)tool.getTask(null, null, dc,
void test(JavaCompiler comp, StandardJavaFileManager fm) throws Exception {
JavacTask ct = (JavacTask)comp.getTask(null, fm, dc,
null, null, Arrays.asList(samSourceFile, pkgClassSourceFile, clientSourceFile));
ct.analyze();
if (dc.errorFound == checkSamConversion()) {
@ -201,8 +228,15 @@ public class LambdaConversionTest {
if (samKind != SamKind.INTERFACE) {
//sam type must be an interface
return false;
} else if (meth != MethodKind.NON_GENERIC) {
//target method must be non-generic
} else if (samMeth == MethodKind.NONE) {
//interface must have at least a method
return false;
} else if (exprKind == ExprKind.LAMBDA &&
samMeth != MethodKind.NON_GENERIC) {
//target method for lambda must be non-generic
return false;
} else if (exprKind == ExprKind.MREF &&
clientMeth == MethodKind.NONE) {
return false;
} else if (samPkg != PackageKind.NO_PKG &&
modKind != ModifierKind.PUBLIC &&

41
langtools/test/tools/javac/lambda/MethodReference57.java Normal file
View File

@ -0,0 +1,41 @@
/*
* Copyright (c) 2012, 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 8004102
* @summary Add support for generic functional descriptors
* @compile MethodReference57.java
*/
class MethodReference57 {
interface F {
<X> void m();
}
void test() {
F f = this::g; //ok
}
void g() { }
}

46
langtools/test/tools/javac/lambda/MethodReference58.java Normal file
View File

@ -0,0 +1,46 @@
/*
* Copyright (c) 2012, 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 8004102
* @summary Add support for generic functional descriptors
* @compile/fail/ref=MethodReference58.out -XDrawDiagnostics MethodReference58.java
*/
class MethodReference58 {
interface F_Object {
<X> void m(X x);
}
interface F_Integer {
<X extends Integer> void m(X x);
}
void test() {
F_Object f1 = this::g; //incompatible bounds
F_Integer f2 = this::g; //ok
}
<Z extends Number> void g(Z z) { }
}

2
langtools/test/tools/javac/lambda/MethodReference58.out Normal file
View File

@ -0,0 +1,2 @@
MethodReference58.java:41:23: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbol: kindname.method, g, Z, X, kindname.class, MethodReference58, (compiler.misc.inferred.do.not.conform.to.upper.bounds: X, java.lang.Number)))
1 error