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

8229862: NPE in jdk.compiler/com.sun.tools.javac.jvm.Code.emitop0(Code.java:570)

Browse Source 
Co-authored-by: Bernard Blaser <bsrbnd@openjdk.org>
Reviewed-by: vromero
This commit is contained in:
Jan Lahoda 2020-12-09 16:49:50 +00:00
parent cf62b0ad86
commit bd22aa5e86
3 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
View File

@ -1454,11 +1454,11 @@ public class LambdaToMethod extends TreeTranslator {
localContext = localContext.prev; localContext = localContext.prev;
} }
} }
super.visitNewClass(tree);
if (context() != null && !inReferencedClass && isLocal) { if (context() != null && !inReferencedClass && isLocal) {
LambdaTranslationContext lambdaContext = (LambdaTranslationContext)context(); LambdaTranslationContext lambdaContext = (LambdaTranslationContext)context();
captureLocalClassDefs(def, lambdaContext); captureLocalClassDefs(def, lambdaContext);
} }
super.visitNewClass(tree);
} }
//where //where
void captureLocalClassDefs(Symbol csym, final LambdaTranslationContext lambdaContext) { void captureLocalClassDefs(Symbol csym, final LambdaTranslationContext lambdaContext) {

7
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
View File

@ -2827,7 +2827,14 @@ public class Lower extends TreeTranslator {
// If we have an anonymous class, create its flat version, rather // If we have an anonymous class, create its flat version, rather
// than the class or interface following new. // than the class or interface following new.
if (tree.def != null) { if (tree.def != null) {
Map<Symbol, Symbol> prevLambdaTranslationMap = lambdaTranslationMap;
try {
lambdaTranslationMap = null;
translate(tree.def); translate(tree.def);
} finally {
lambdaTranslationMap = prevLambdaTranslationMap;
}
tree.clazz = access(make_at(tree.clazz.pos()).Ident(tree.def.sym)); tree.clazz = access(make_at(tree.clazz.pos()).Ident(tree.def.sym));
tree.def = null; tree.def = null;
} else { } else {

54
test/langtools/tools/javac/lambda/LambdaConv30.java Normal file
View File

@ -0,0 +1,54 @@
/*
* 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 8229862
* @summary Verifying lambdas anonymous classes whose supertype captures works.
* @compile LambdaConv30.java
* @run main LambdaConv30
*/
public class LambdaConv30 {
public static void main(String[] args) {
Integer a = 1;
class Inner {
int i;
Inner(int i) {
this.i = i;
}
public int result() {
return a * 1000 + i;
}
}
SAM s = v -> new Inner(v) { }.result();
if (s.m(2) != 1002) {
throw new AssertionError("Unexpected value!");
}
}
interface SAM {
int m(int v);
}
}