infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-20 21:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

8030626: java.lang.VerifyError: Bad return type when lambda's body is in parentheses

Browse Source 
Properly type convert the body of a lambda expression (forward port to JDK9 of 8029558)

Reviewed-by: vromero
This commit is contained in:
Robert Field 2013-12-22 21:57:01 -08:00
parent b0f5f93cd0
commit 8d4ba575b6
3 changed files with 98 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
View File

@ -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;
}

48
langtools/test/tools/javac/lambda/LambdaParenGeneric.java Normal file
View File

@ -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> {
A value;
Val(A v) { value = v; }
}
public static void main(String[] args) {
FI inc = () -> (new Val<Integer>(77).value);
System.out.println(inc.apply());
}
}

49
langtools/test/tools/javac/lambda/LambdaParenGenericOrig.java Normal file
View File

@ -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, A> {
R apply(A input);
}
@FunctionalInterface
public static interface Function2<R, A1, A2> {
R apply(A1 input1, A2 input2);
}
public static void main(String[] args) {
final Function2<Integer, Integer, Integer> add = (x, y) -> x + y;
final Function1<Integer, Integer> inc = x -> (add.apply(x, 1));
System.out.println(inc.apply(0));
}
}