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

8010006: NPE in javac with interface super in lambda

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Robert Field 2013-05-15 06:53:01 -07:00
parent 4b1aa379e5
commit 495e78ce52
2 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
View File

@ -28,7 +28,6 @@ import com.sun.tools.javac.tree.*;
import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.tree.JCTree.JCMemberReference.ReferenceKind;
import com.sun.tools.javac.tree.TreeMaker;
import com.sun.tools.javac.tree.TreeScanner;
import com.sun.tools.javac.tree.TreeTranslator;
import com.sun.tools.javac.code.Attribute;
import com.sun.tools.javac.code.Kinds;
@ -165,7 +164,7 @@ public class LambdaToMethod extends TreeTranslator {
return translate(tree, newContext != null ? newContext : context);
}
public <T extends JCTree> T translate(T tree, TranslationContext<?> newContext) {
<T extends JCTree> T translate(T tree, TranslationContext<?> newContext) {
TranslationContext<?> prevContext = context;
try {
context = newContext;
@ -176,7 +175,7 @@ public class LambdaToMethod extends TreeTranslator {
}
}
public <T extends JCTree> List<T> translate(List<T> trees, TranslationContext<?> newContext) {
<T extends JCTree> List<T> translate(List<T> trees, TranslationContext<?> newContext) {
ListBuffer<T> buf = ListBuffer.lb();
for (T tree : trees) {
buf.append(translate(tree, newContext));
@ -1303,7 +1302,11 @@ public class LambdaToMethod extends TreeTranslator {
@Override
public void visitSelect(JCFieldAccess tree) {
if (context() != null && lambdaSelectSymbolFilter(tree.sym)) {
if (context() != null && tree.sym.kind == VAR &&
(tree.sym.name == names._this ||
tree.sym.name == names._super)) {
// A select of this or super means, if we are in a lambda,
// we much have an instance context
TranslationContext<?> localContext = context();
while (localContext != null) {
if (localContext.tree.hasTag(LAMBDA)) {
@ -1554,13 +1557,6 @@ public class LambdaToMethod extends TreeTranslator {
&& sym.name != names.init;
}
private boolean lambdaSelectSymbolFilter(Symbol sym) {
return (sym.kind == VAR || sym.kind == MTH) &&
!sym.isStatic() &&
(sym.name == names._this ||
sym.name == names._super);
}
/**
* This is used to filter out those new class expressions that need to
* be qualified with an enclosing tree

43
langtools/test/tools/javac/lambda/LambdaWithInterfaceSuper.java Normal file
View File

@ -0,0 +1,43 @@
/*
* 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 8010006
* @summary NPE in javac with interface super in lambda
* @compile LambdaWithInterfaceSuper.java
*/
class LambdaWithInterfaceSuper {
interface Sup {
default void m() {}
}
interface I extends Sup {
default void m() {
Runnable r = ()-> { Sup.super.m(); };
r.run();
}
}
}