archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 19:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8143217: javac throws NPE when printing diagnostics for Lambda expressions

Browse source 
Fix compiler crash when -XDdumpLambdaToMethodStats option is in effect.

Reviewed-by: mcimadamore
This commit is contained in:
Srikanth Adayapalam 2015-11-19 17:19:06 +05:30
parent 6ce337adaf
commit 54029caa26
2 changed files with 64 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
View file

@ -1379,9 +1379,6 @@ public class LambdaToMethod extends TreeTranslator {
List<Frame> prevStack = frameStack; List<Frame> prevStack = frameStack;
try { try {
LambdaTranslationContext context = new LambdaTranslationContext(tree); LambdaTranslationContext context = new LambdaTranslationContext(tree);
if (dumpLambdaToMethodStats) {
log.note(tree, statKey, context.needsAltMetafactory(), context.translatedSym);
}
frameStack = frameStack.prepend(new Frame(tree)); frameStack = frameStack.prepend(new Frame(tree));
for (JCVariableDecl param : tree.params) { for (JCVariableDecl param : tree.params) {
context.addSymbol(param.sym, PARAM); context.addSymbol(param.sym, PARAM);
@ -1390,6 +1387,9 @@ public class LambdaToMethod extends TreeTranslator {
contextMap.put(tree, context); contextMap.put(tree, context);
super.visitLambda(tree); super.visitLambda(tree);
context.complete(); context.complete();
if (dumpLambdaToMethodStats) {
log.note(tree, statKey, context.needsAltMetafactory(), context.translatedSym);
}
return context; return context;
} }
finally { finally {

61
langtools/test/tools/javac/lambda/XDdumpLambdaToMethodStats.java Normal file
View file

@ -0,0 +1,61 @@
/*
* Copyright (c) 2015, 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 8143217
* @summary javac throws NPE when printing diagnostics for Lambda expressions
* @compile XDdumpLambdaToMethodStats.java -XDdumpLambdaToMethodStats
*
*/
/*
* Note: No golden file since the crash is reproducible only when raw
* diagnostics are not in effect.
*/
public class XDdumpLambdaToMethodStats {
public static void main(String... a) {
new XDdumpLambdaToMethodStats().run();
}
public void run() {
printHash(this::m);
printHash(XDdumpLambdaToMethodStats::sm);
printHash(() -> { o = new Object(); });
printHash(() -> { s = new Object(); });
}
private void printHash(Runnable function) {
System.out.println(function + "; hash=" + function.hashCode());
}
private static void sm() {
}
private void m() {
}
private Object o;
private static Object s;
}