diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java index 45303529a3c..dd18927c295 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java @@ -1696,6 +1696,11 @@ public class JavacParser implements Parser { if (lambdaClassifier.diagFragment != null) { log.error(DiagnosticFlag.SYNTAX, pos, Errors.InvalidLambdaParameterDeclaration(lambdaClassifier.diagFragment)); } + for (JCVariableDecl param: params) { + if (param.vartype != null && isRestrictedLocalVarTypeName(param.vartype)) { + param.vartype = null; + } + } } return lambdaExpressionOrStatementRest(params, pos); } diff --git a/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01.java b/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01.java index 2ef936a0786..4a39be13cb1 100644 --- a/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01.java +++ b/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01.java @@ -1,6 +1,6 @@ /* * @test /nodynamiccopyright/ - * @bug 8198512 + * @bug 8198512 8199327 * @summary compiler support for local-variable syntax for lambda parameters * @compile/fail/ref=VarInImplicitLambdaNegTest01.out -XDrawDiagnostics VarInImplicitLambdaNegTest01.java */ @@ -14,5 +14,8 @@ class VarInImplicitLambdaNegTest01 { IntBinaryOperator f4 = (int x, y) -> x + y; // error explicit and implicit BiFunction f5 = (var s1[], var s2) -> s2; // error var and array + + // correct use + IntBinaryOperator f6 = (var x, var y) -> x + y; // ok BiFunction, String, String> f = (Function s1, String s2) -> s2; // ok }