From 8d4ba575b618b36ecc667dcb8f2a7730070d768e Mon Sep 17 00:00:00 2001 From: Robert Field Date: Sun, 22 Dec 2013 21:57:01 -0800 Subject: [PATCH] 8030626: java.lang.VerifyError: Bad return type when lambda's body is in parentheses Properly type convert the body of a lambda expression (forward port to JDK9 of 8029558) Reviewed-by: vromero --- .../com/sun/tools/javac/comp/TransTypes.java | 2 +- .../javac/lambda/LambdaParenGeneric.java | 48 ++++++++++++++++++ .../javac/lambda/LambdaParenGenericOrig.java | 49 +++++++++++++++++++ 3 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 langtools/test/tools/javac/lambda/LambdaParenGeneric.java create mode 100644 langtools/test/tools/javac/lambda/LambdaParenGenericOrig.java diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java b/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java index 5bf53f653a0..0d043ba1f61 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java @@ -585,7 +585,7 @@ public class TransTypes extends TreeTranslator { try { currentMethod = null; tree.params = translate(tree.params); - tree.body = translate(tree.body, null); + tree.body = translate(tree.body, tree.body.type==null? null : erasure(tree.body.type)); tree.type = erasure(tree.type); result = tree; } diff --git a/langtools/test/tools/javac/lambda/LambdaParenGeneric.java b/langtools/test/tools/javac/lambda/LambdaParenGeneric.java new file mode 100644 index 00000000000..d98b8c2e52b --- /dev/null +++ b/langtools/test/tools/javac/lambda/LambdaParenGeneric.java @@ -0,0 +1,48 @@ +/* + * 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 8029558 + * @summary VerifyError lambda body is parenthesized generic value + * @author Robert Field + * @run main LambdaParenGeneric + */ + +public class LambdaParenGeneric { + + @FunctionalInterface + public interface FI { + Integer apply(); + } + + public static class Val { + A value; + Val(A v) { value = v; } + } + + public static void main(String[] args) { + FI inc = () -> (new Val(77).value); + System.out.println(inc.apply()); + } +} diff --git a/langtools/test/tools/javac/lambda/LambdaParenGenericOrig.java b/langtools/test/tools/javac/lambda/LambdaParenGenericOrig.java new file mode 100644 index 00000000000..20f63bcb5ab --- /dev/null +++ b/langtools/test/tools/javac/lambda/LambdaParenGenericOrig.java @@ -0,0 +1,49 @@ +/* + * 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 8029558 + * @summary VerifyError lambda body is parenthesized generic value (originally submitted test) + * @author Dmitrii Afanasyev + * @run main LambdaParenGenericOrig + */ + +public class LambdaParenGenericOrig { + + @FunctionalInterface + public static interface Function1 { + R apply(A input); + } + + @FunctionalInterface + public static interface Function2 { + R apply(A1 input1, A2 input2); + } + + public static void main(String[] args) { + final Function2 add = (x, y) -> x + y; + final Function1 inc = x -> (add.apply(x, 1)); + System.out.println(inc.apply(0)); + } +}