changeset 49054:9e3f2ec326ba

8198502: Exception at runtime due to lambda analyzer reattributes live AST Summary: Create a deep copy of the original tree before conversion to lambda node Reviewed-by: mcimadamore, vromero Contributed-by: srinivas.dama@oracle.com
author sdama
date Fri, 23 Feb 2018 01:54:09 +0530
parents b25eb74ec283
children 20358c9f72c1
files src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java test/langtools/tools/javac/T8198502.java
diffstat 2 files changed, 60 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java	Wed Feb 21 17:07:12 2018 +0100
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java	Fri Feb 23 01:54:09 2018 +0530
@@ -304,7 +304,7 @@
 
         @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);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/T8198502.java	Fri Feb 23 01:54:09 2018 +0530
@@ -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();
+    }
+
+}