changeset 47248:22d665f53a4a

8044853: Attr synthesizes nullcheck tree nodes Summary: Avoid move of JCNewClass.encl to args in front end phases. Reviewed-by: jjg
author jlahoda
date Fri, 22 Sep 2017 14:06:11 +0200
parents 42bc5bf0c654
children 82c43b3c0ea0 50790528dd25
files src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java test/langtools/tools/javac/tree/NewClassDefEnclosing.java
diffstat 6 files changed, 117 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java	Fri Sep 22 12:00:41 2017 +0200
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java	Fri Sep 22 14:06:11 2017 +0200
@@ -308,6 +308,11 @@
      */
     public static final long HAS_RESOURCE = 1L<<56;
 
+    /**
+     * Flag for synthesized default constructors of anonymous classes that have an enclosing expression.
+     */
+    public static final long ANONCONSTR_BASED = 1L<<57;
+
     /** Modifier masks.
      */
     public static final int
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java	Fri Sep 22 12:00:41 2017 +0200
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java	Fri Sep 22 14:06:11 2017 +0200
@@ -2305,9 +2305,7 @@
                 // prefix it to the constructor arguments
                 // and delete it from the new expression
                 if (tree.encl != null && !clazztype.tsym.isInterface()) {
-                    tree.args = tree.args.prepend(makeNullCheck(tree.encl));
                     finalargtypes = argtypes.prepend(tree.encl.type);
-                    tree.encl = null;
                 } else {
                     finalargtypes = argtypes;
                 }
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java	Fri Sep 22 12:00:41 2017 +0200
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java	Fri Sep 22 14:06:11 2017 +0200
@@ -965,6 +965,10 @@
             formals = formals.tail.tail;
             nonInferred = nonInferred.tail.tail;
         }
+        if ((sym.flags() & ANONCONSTR_BASED) != 0) {
+            formals = formals.tail;
+            nonInferred = nonInferred.tail;
+        }
         List<JCExpression> args = argtrees;
         if (args != null) {
             //this is null when type-checking a method reference
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java	Fri Sep 22 12:00:41 2017 +0200
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java	Fri Sep 22 14:06:11 2017 +0200
@@ -72,6 +72,7 @@
     private Enter enter;
     private Types types;
     private Annotate annotate;
+    private Attr attr;
     private final Resolve resolve;
     private final CompileStates compileStates;
 
@@ -96,6 +97,7 @@
         allowInterfaceBridges = source.allowDefaultMethods();
         allowGraphInference = source.allowGraphInference();
         annotate = Annotate.instance(context);
+        attr = Attr.instance(context);
     }
 
     /** A hashtable mapping bridge methods to the pair of methods they bridge.
@@ -693,8 +695,14 @@
     }
 
     public void visitNewClass(JCNewClass tree) {
-        if (tree.encl != null)
-            tree.encl = translate(tree.encl, erasure(tree.encl.type));
+        if (tree.encl != null) {
+            if (tree.def == null) {
+                tree.encl = translate(tree.encl, erasure(tree.encl.type));
+            } else {
+                tree.args = tree.args.prepend(attr.makeNullCheck(tree.encl));
+                tree.encl = null;
+            }
+        }
 
         Type erasedConstructorType = tree.constructorType != null ?
                 erasure(tree.constructorType) :
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java	Fri Sep 22 12:00:41 2017 +0200
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java	Fri Sep 22 14:06:11 2017 +0200
@@ -1030,6 +1030,9 @@
         if (c.name.isEmpty()) {
             flags |= ANONCONSTR;
         }
+        if (based) {
+            flags |= ANONCONSTR_BASED;
+        }
         Type mType = new MethodType(argtypes, null, thrown, c);
         Type initType = typarams.nonEmpty() ?
             new ForAll(typarams, mType) :
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/tree/NewClassDefEnclosing.java	Fri Sep 22 14:06:11 2017 +0200
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2017, 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 8044853
+ * @summary Check that enclosing element is not cleared in JCNewClass
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.tree
+ */
+
+import com.sun.source.tree.ClassTree;
+import com.sun.source.tree.CompilationUnitTree;
+import com.sun.tools.javac.api.JavacTaskImpl;
+import com.sun.tools.javac.tree.JCTree;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+
+public class NewClassDefEnclosing {
+    private final JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
+
+    public static void main(String... args) throws Exception {
+        NewClassDefEnclosing nap = new NewClassDefEnclosing();
+        nap.run("O.I i = new O().new I() {}; class O { class I { } }",
+                "O.I i = new O().new I(){ (.Test.O x0) { x0.super(); } }");
+        nap.run("O.I i = new O().new I(1, \"2\") {}; class O { class I { public I(int i, String s) { } }",
+                "O.I i = new O().new I(1, \"2\"){ (.Test.O x0, int i, java.lang.String s) { x0.super(i, s); } }");
+    }
+
+    void run(String code, String expected) throws IOException {
+        String src = "public class Test {" + code + "}";
+
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, List.of("-doe"),
+                null, Arrays.asList(new MyFileObject(src)));
+
+        Iterable<? extends CompilationUnitTree> units = ct.parse();
+        ct.analyze();
+
+        for (CompilationUnitTree cut : units) {
+            JCTree.JCVariableDecl var =
+                    (JCTree.JCVariableDecl) ((ClassTree) cut.getTypeDecls().get(0)).getMembers().get(1);
+
+            expected = expected.replaceAll("[ \n]+", " ");
+            String actual = var.toString().replaceAll("[ \n]+", " ");
+
+            if (!expected.equals(actual)) {
+                System.err.println("Expected: " + expected);
+                System.err.println("Obtained: " + actual);
+                throw new RuntimeException("strings do not match!");
+            }
+        }
+    }
+    class MyFileObject extends SimpleJavaFileObject {
+
+        private String text;
+
+        public MyFileObject(String text) {
+            super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
+            this.text = text;
+        }
+
+        @Override
+        public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+            return text;
+        }
+    }
+}