GROOVY-9707

groovy · Jan 25, 2021 · 9a8c8d8 · 9a8c8d8
1 parent 1b4760f
commit 9a8c8d8
Show file tree

Hide file tree

Showing 7 changed files with 239 additions and 0 deletions.
diff --git a/...ovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java b/...ovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java
@@ -430,6 +430,31 @@ public void testTypeChecked9570() {
         runNegativeTest(sources, "");
     }
 
+    @Test
+    public void testTypeChecked9707() {
+        Map<String, String> options = getCompilerOptions();
+        options.put(CompilerOptions.OPTIONG_GroovyCompilerConfigScript, createScript("config.groovy",
+            "withConfig(configuration) {\n" +
+            "  ast(groovy.transform.CompileStatic)\n" +
+            "}\n"
+        ).getAbsolutePath());
+
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.TypeChecked\n" +
+            "class C {\n" +
+            "  def m() {\n" +
+            "    'a' + 'b'\n" +
+            "  }\n" +
+            "}\n" +
+            "print new C().m()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "ab", options);
+    }
+
     @Test
     public void testTypeChecked9735() {
         //@formatter:off

diff --git a/base/org.codehaus.groovy30/.checkstyle b/base/org.codehaus.groovy30/.checkstyle
@@ -69,6 +69,7 @@
         <file-match-pattern match-pattern="groovy/transform/FieldASTTransformation.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/transform/LogASTTransformation.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/transform/sc/StaticCompilationVisitor.java" include-pattern="false" />
+        <file-match-pattern match-pattern="groovy/transform/sc/StaticCompileTransformation.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/transform/sc/transformers/(Binary|MethodCall)ExpressionTransformer.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/transform/sc/transformers/CompareToNullExpression.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/transform/stc/AbstractExtensionMethodCache.java" include-pattern="false" />

diff --git a/...g.codehaus.groovy30/src/org/codehaus/groovy/transform/sc/StaticCompileTransformation.java b/...g.codehaus.groovy30/src/org/codehaus/groovy/transform/sc/StaticCompileTransformation.java
@@ -0,0 +1,103 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.codehaus.groovy.transform.sc;
+
+import org.codehaus.groovy.ast.ASTNode;
+import org.codehaus.groovy.ast.AnnotatedNode;
+import org.codehaus.groovy.ast.AnnotationNode;
+import org.codehaus.groovy.ast.ClassNode;
+import org.codehaus.groovy.ast.MethodNode;
+import org.codehaus.groovy.ast.expr.Expression;
+import org.codehaus.groovy.classgen.asm.WriterControllerFactory;
+import org.codehaus.groovy.classgen.asm.sc.StaticTypesWriterControllerFactoryImpl;
+import org.codehaus.groovy.control.CompilePhase;
+import org.codehaus.groovy.control.SourceUnit;
+import org.codehaus.groovy.syntax.SyntaxException;
+import org.codehaus.groovy.transform.GroovyASTTransformation;
+import org.codehaus.groovy.transform.StaticTypesTransformation;
+import org.codehaus.groovy.transform.sc.transformers.StaticCompilationTransformer;
+import org.codehaus.groovy.transform.stc.StaticTypeCheckingVisitor;
+
+import java.util.Collections;
+import java.util.Map;
+
+import static org.codehaus.groovy.transform.sc.StaticCompilationMetadataKeys.STATIC_COMPILE_NODE;
+
+/**
+ * Handles the implementation of the {@link groovy.transform.CompileStatic} transformation.
+ */
+@GroovyASTTransformation(phase = CompilePhase.INSTRUCTION_SELECTION)
+public class StaticCompileTransformation extends StaticTypesTransformation {
+
+    private final StaticTypesWriterControllerFactoryImpl factory = new StaticTypesWriterControllerFactoryImpl();
+
+    @Override
+    public void visit(final ASTNode[] nodes, final SourceUnit source) {
+        AnnotationNode annotationInformation = (AnnotationNode) nodes[0];
+        AnnotatedNode node = (AnnotatedNode) nodes[1];
+        // GRECLIPSE add -- GROOVY-9707
+        if (node.getNodeMetaData(StaticTypeCheckingVisitor.class)!=null){
+            return;
+        }
+        // GRECLIPSE end
+        StaticTypeCheckingVisitor visitor = null;
+        Map<String,Expression> members = annotationInformation.getMembers();
+        Expression extensions = members.get("extensions");
+        if (node instanceof ClassNode) {
+            ClassNode classNode = (ClassNode) node;
+            visitor = newVisitor(source, classNode);
+            visitor.setCompilationUnit(compilationUnit);
+            addTypeCheckingExtensions(visitor, extensions);
+            classNode.putNodeMetaData(WriterControllerFactory.class, factory);
+            node.putNodeMetaData(STATIC_COMPILE_NODE, !visitor.isSkipMode(node));
+            visitor.initialize();
+            visitor.visitClass(classNode);
+        } else if (node instanceof MethodNode) {
+            MethodNode methodNode = (MethodNode) node;
+            ClassNode declaringClass = methodNode.getDeclaringClass();
+            visitor = newVisitor(source, declaringClass);
+            visitor.setCompilationUnit(compilationUnit);
+            addTypeCheckingExtensions(visitor, extensions);
+            methodNode.putNodeMetaData(STATIC_COMPILE_NODE, !visitor.isSkipMode(node));
+            if (declaringClass.getNodeMetaData(WriterControllerFactory.class) == null) {
+                declaringClass.putNodeMetaData(WriterControllerFactory.class, factory);
+            }
+            visitor.setMethodsToBeVisited(Collections.singleton(methodNode));
+            visitor.initialize();
+            visitor.visitMethod(methodNode);
+        } else {
+            source.addError(new SyntaxException(STATIC_ERROR_PREFIX + "Unimplemented node type",
+                    node.getLineNumber(), node.getColumnNumber(), node.getLastLineNumber(), node.getLastColumnNumber()));
+        }
+        if (visitor != null) {
+            visitor.performSecondPass();
+        }
+        StaticCompilationTransformer transformer = new StaticCompilationTransformer(source, visitor);
+        if (node instanceof ClassNode) {
+            transformer.visitClass((ClassNode) node);
+        } else if (node instanceof MethodNode) {
+            transformer.visitMethod((MethodNode) node);
+        }
+    }
+
+    @Override
+    protected StaticTypeCheckingVisitor newVisitor(final SourceUnit unit, final ClassNode node) {
+        return new StaticCompilationVisitor(unit, node);
+    }
+}
diff --git a/...rg.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -414,6 +414,9 @@ public void visitClass(final ClassNode node) {
             }
 
             node.putNodeMetaData(INFERRED_TYPE, node);
+            // GRECLIPSE add -- GROOVY-9707
+            node.putNodeMetaData(StaticTypeCheckingVisitor.class, Boolean.TRUE);
+            // GRECLIPSE end
             // mark all methods as visited. We can't do this in visitMethod because the type checker
             // works in a two pass sequence and we don't want to skip the second pass
             node.getMethods().forEach(n -> n.putNodeMetaData(StaticTypeCheckingVisitor.class, Boolean.TRUE));

diff --git a/base/org.codehaus.groovy40/.checkstyle b/base/org.codehaus.groovy40/.checkstyle
@@ -66,6 +66,7 @@
         <file-match-pattern match-pattern="groovy/transform/LogASTTransformation.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/transform/NotYetImplemented.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/transform/sc/StaticCompilationVisitor.java" include-pattern="false" />
+        <file-match-pattern match-pattern="groovy/transform/sc/StaticCompileTransformation.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/transform/sc/transformers/(Binary|MethodCall)ExpressionTransformer.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/transform/sc/transformers/CompareToNullExpression.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/transform/stc/StaticTypeCheckingSupport.java" include-pattern="false" />

diff --git a/...g.codehaus.groovy40/src/org/codehaus/groovy/transform/sc/StaticCompileTransformation.java b/...g.codehaus.groovy40/src/org/codehaus/groovy/transform/sc/StaticCompileTransformation.java
@@ -0,0 +1,103 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.codehaus.groovy.transform.sc;
+
+import org.codehaus.groovy.ast.ASTNode;
+import org.codehaus.groovy.ast.AnnotatedNode;
+import org.codehaus.groovy.ast.AnnotationNode;
+import org.codehaus.groovy.ast.ClassNode;
+import org.codehaus.groovy.ast.MethodNode;
+import org.codehaus.groovy.ast.expr.Expression;
+import org.codehaus.groovy.classgen.asm.WriterControllerFactory;
+import org.codehaus.groovy.classgen.asm.sc.StaticTypesWriterControllerFactoryImpl;
+import org.codehaus.groovy.control.CompilePhase;
+import org.codehaus.groovy.control.SourceUnit;
+import org.codehaus.groovy.syntax.SyntaxException;
+import org.codehaus.groovy.transform.GroovyASTTransformation;
+import org.codehaus.groovy.transform.StaticTypesTransformation;
+import org.codehaus.groovy.transform.sc.transformers.StaticCompilationTransformer;
+import org.codehaus.groovy.transform.stc.StaticTypeCheckingVisitor;
+
+import java.util.Collections;
+import java.util.Map;
+
+import static org.codehaus.groovy.transform.sc.StaticCompilationMetadataKeys.STATIC_COMPILE_NODE;
+
+/**
+ * Handles the implementation of the {@link groovy.transform.CompileStatic} transformation.
+ */
+@GroovyASTTransformation(phase = CompilePhase.INSTRUCTION_SELECTION)
+public class StaticCompileTransformation extends StaticTypesTransformation {
+
+    private final StaticTypesWriterControllerFactoryImpl factory = new StaticTypesWriterControllerFactoryImpl();
+
+    @Override
+    public void visit(final ASTNode[] nodes, final SourceUnit source) {
+        AnnotationNode annotationInformation = (AnnotationNode) nodes[0];
+        AnnotatedNode node = (AnnotatedNode) nodes[1];
+        // GRECLIPSE add -- GROOVY-9707
+        if (node.getNodeMetaData(StaticTypeCheckingVisitor.class)!=null){
+            return;
+        }
+        // GRECLIPSE end
+        StaticTypeCheckingVisitor visitor = null;
+        Map<String,Expression> members = annotationInformation.getMembers();
+        Expression extensions = members.get("extensions");
+        if (node instanceof ClassNode) {
+            ClassNode classNode = (ClassNode) node;
+            visitor = newVisitor(source, classNode);
+            visitor.setCompilationUnit(compilationUnit);
+            addTypeCheckingExtensions(visitor, extensions);
+            classNode.putNodeMetaData(WriterControllerFactory.class, factory);
+            node.putNodeMetaData(STATIC_COMPILE_NODE, !visitor.isSkipMode(node));
+            visitor.initialize();
+            visitor.visitClass(classNode);
+        } else if (node instanceof MethodNode) {
+            MethodNode methodNode = (MethodNode) node;
+            ClassNode declaringClass = methodNode.getDeclaringClass();
+            visitor = newVisitor(source, declaringClass);
+            visitor.setCompilationUnit(compilationUnit);
+            addTypeCheckingExtensions(visitor, extensions);
+            methodNode.putNodeMetaData(STATIC_COMPILE_NODE, !visitor.isSkipMode(node));
+            if (declaringClass.getNodeMetaData(WriterControllerFactory.class) == null) {
+                declaringClass.putNodeMetaData(WriterControllerFactory.class, factory);
+            }
+            visitor.setMethodsToBeVisited(Collections.singleton(methodNode));
+            visitor.initialize();
+            visitor.visitMethod(methodNode);
+        } else {
+            source.addError(new SyntaxException(STATIC_ERROR_PREFIX + "Unimplemented node type",
+                    node.getLineNumber(), node.getColumnNumber(), node.getLastLineNumber(), node.getLastColumnNumber()));
+        }
+        if (visitor != null) {
+            visitor.performSecondPass();
+        }
+        StaticCompilationTransformer transformer = new StaticCompilationTransformer(source, visitor);
+        if (node instanceof ClassNode) {
+            transformer.visitClass((ClassNode) node);
+        } else if (node instanceof MethodNode) {
+            transformer.visitMethod((MethodNode) node);
+        }
+    }
+
+    @Override
+    protected StaticTypeCheckingVisitor newVisitor(final SourceUnit unit, final ClassNode node) {
+        return new StaticCompilationVisitor(unit, node);
+    }
+}
diff --git a/...rg.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -414,6 +414,9 @@ public void visitClass(final ClassNode node) {
             }
 
             node.putNodeMetaData(INFERRED_TYPE, node);
+            // GRECLIPSE add -- GROOVY-9707
+            node.putNodeMetaData(StaticTypeCheckingVisitor.class, Boolean.TRUE);
+            // GRECLIPSE end
             // mark all methods as visited. We can't do this in visitMethod because the type checker
             // works in a two pass sequence and we don't want to skip the second pass
             node.getMethods().forEach(n -> n.putNodeMetaData(StaticTypeCheckingVisitor.class, Boolean.TRUE));