8198502: Exception at runtime due to lambda analyzer reattributes live AST

Create a deep copy of the original tree before conversion to lambda node

Reviewed-by: mcimadamore, vromero
This commit is contained in:
Srinivas Dama 2018-02-23 01:54:09 +05:30 committed by Srinivas Dama
parent ddf6846500
commit 90b572b0c9
2 changed files with 60 additions and 1 deletions
src/jdk.compiler/share/classes/com/sun/tools/javac/comp
test/langtools/tools/javac

@ -304,7 +304,7 @@ public class Analyzer {
@Override
List<JCLambda> rewrite(JCNewClass oldTree){
JCMethodDecl md = (JCMethodDecl)decls(oldTree.def).head;
JCMethodDecl md = (JCMethodDecl)copier.copy(decls(oldTree.def).head);
List<JCVariableDecl> params = md.params;
JCBlock body = md.body;
JCLambda newTree = make.at(oldTree).Lambda(params, body);

@ -0,0 +1,59 @@
/*
* Copyright (c) 2018, 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 8198502
* @summary Exception at runtime due to lambda analyzer reattributes live AST
* @run compile -XDfind=lambda T8198502.java
* @run main T8198502
*/
public class T8198502 {
public static void main(String... args) {
new T8198502().run();
}
private void run() {
Base b = new Base() {
public void run() {
test(this);
}
};
b.run();
}
private static void test(T8198502 t) {
throw new AssertionError("Should not be invoked!");
}
private static void test(Base b) {
//ok to invoke
}
public static interface Base {
void run();
}
}