Skip to content
Permalink
Browse files
8257740: Compiler crash when compiling type annotation on multicatch …
…inside lambda

Reviewed-by: vromero
  • Loading branch information
lgxbslgx authored and Vicente Romero committed Jan 8, 2021
1 parent b549cbd commit 697bf7ab51181866fe51a7f8d7410c33e4416a7f
@@ -2070,10 +2070,22 @@ public Symbol baseSymbol() {
case LOCAL_VAR:
ret = new VarSymbol(sym.flags() & FINAL, sym.name, sym.type, translatedSym);
((VarSymbol) ret).pos = ((VarSymbol) sym).pos;
// If sym.data == ElementKind.EXCEPTION_PARAMETER,
// set ret.data = ElementKind.EXCEPTION_PARAMETER too.
// Because method com.sun.tools.javac.jvm.Code.fillExceptionParameterPositions and
// com.sun.tools.javac.jvm.Code.fillLocalVarPosition would use it.
// See JDK-8257740 for more information.
if (((VarSymbol) sym).isExceptionParameter()) {
((VarSymbol) ret).setData(ElementKind.EXCEPTION_PARAMETER);
}
break;
case PARAM:
ret = new VarSymbol((sym.flags() & FINAL) | PARAMETER, sym.name, types.erasure(sym.type), translatedSym);
((VarSymbol) ret).pos = ((VarSymbol) sym).pos;
// Set ret.data. Same as case LOCAL_VAR above.
if (((VarSymbol) sym).isExceptionParameter()) {
((VarSymbol) ret).setData(ElementKind.EXCEPTION_PARAMETER);
}
break;
default:
Assert.error(skind.name());
@@ -0,0 +1,47 @@
/*
* Copyright (c) 2020, 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 8257740
* @summary Compiler crash when compiling type annotation on uni-catch inside lambda
* @run compile T8257740_1.java
*/

import java.lang.annotation.ElementType;
import java.lang.annotation.Target;

public class T8257740_1 {
@Target(ElementType.TYPE_USE)
@interface T8257740_1_Anno { }

void test() {
Runnable r = () -> {
try {
System.out.println();
} catch (@T8257740_1_Anno Exception e) { // uni-catch
e.printStackTrace();
}
};
}
}
@@ -0,0 +1,47 @@
/*
* Copyright (c) 2020, 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 8257740
* @summary Compiler crash when compiling type annotation on multi-catch inside lambda
* @run compile T8257740_2.java
*/

import java.lang.annotation.ElementType;
import java.lang.annotation.Target;

public class T8257740_2 {
@Target(ElementType.TYPE_USE)
@interface T8257740_2_Anno { }

void test() {
Runnable r = () -> {
try {
System.out.println();
} catch (@T8257740_2_Anno Exception | Error e) { // multi-catch
e.printStackTrace();
}
};
}
}

1 comment on commit 697bf7a

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on 697bf7a Jan 8, 2021

Please sign in to comment.