You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2022/02/24 19:37:31 UTC
[groovy] 03/06: GROOVY-9327: handle STC for AIC in non-STC class but STC method
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 29d454c1bb065ffe3cb3bfe5cf1e790e559daec2
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Mon Dec 23 13:35:55 2019 -0600
GROOVY-9327: handle STC for AIC in non-STC class but STC method
(cherry picked from commit 44893abc65656fa45f468e970da2964fd181a0ef)
Conflicts:
src/main/java/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java
src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
---
.../transform/sc/StaticCompilationVisitor.java | 13 +++--
.../transform/stc/StaticTypeCheckingVisitor.java | 17 +++++-
src/test/groovy/bugs/Groovy9327.groovy | 60 ++++++++++++++++++++++
.../stc/AnonymousInnerClassSTCTest.groovy | 5 +-
4 files changed, 89 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java b/src/main/java/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java
index b90cd8d..e48b3d7 100644
--- a/src/main/java/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java
@@ -437,11 +437,18 @@ public class StaticCompilationVisitor extends StaticTypeCheckingVisitor {
public void visitConstructorCallExpression(final ConstructorCallExpression call) {
super.visitConstructorCallExpression(call);
+ // GROOVY-9327: propagate compilation disposition to anon. inner class
+ if (call.isUsingAnonymousInnerClass() && call.getType().getNodeMetaData(StaticTypeCheckingVisitor.class) != null) {
+ ClassNode anonType = call.getType();
+ anonType.putNodeMetaData(STATIC_COMPILE_NODE, anonType.getEnclosingMethod().getNodeMetaData(STATIC_COMPILE_NODE));
+ anonType.putNodeMetaData(WriterControllerFactory.class, anonType.getOuterClass().getNodeMetaData(WriterControllerFactory.class));
+ }
+
MethodNode target = (MethodNode) call.getNodeMetaData(DIRECT_METHOD_CALL_TARGET);
- if (target==null && call.getLineNumber()>0) {
+ if (target == null && call.getLineNumber() > 0) {
addError("Target constructor for constructor call expression hasn't been set", call);
} else {
- if (target==null) {
+ if (target == null) {
// try to find a target
ArgumentListExpression argumentListExpression = InvocationWriter.makeArgumentList(call.getArguments());
List<Expression> expressions = argumentListExpression.getExpressions();
@@ -454,7 +461,7 @@ public class StaticCompilationVisitor extends StaticTypeCheckingVisitor {
target = constructor;
}
}
- if (target!=null) {
+ if (target != null) {
memorizeInitialExpressions(target);
}
}
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index 695b69f..d16bdfe 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -430,7 +430,7 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
}
protected boolean shouldSkipClassNode(final ClassNode node) {
- return isSkipMode(node);
+ return Boolean.TRUE.equals(node.getNodeMetaData(StaticTypeCheckingVisitor.class)) || isSkipMode(node);
}
public boolean isSkipMode(final AnnotatedNode node) {
@@ -2232,6 +2232,21 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
visitMethodCallArguments(receiver, argumentList, true, node);
}
}
+
+ // GROOVY-9327: check for AIC in STC method with non-STC enclosing class
+ if (call.isUsingAnonymousInnerClass()) {
+ Set<MethodNode> methods = typeCheckingContext.methodsToBeVisited;
+ if (!methods.isEmpty()) { // indicates specific methods have STC
+ typeCheckingContext.methodsToBeVisited = Collections.emptySet();
+
+ ClassNode anonType = call.getType();
+ visitClass(anonType); // visit anon. inner class inline with method
+ anonType.putNodeMetaData(StaticTypeCheckingVisitor.class, Boolean.TRUE);
+
+ typeCheckingContext.methodsToBeVisited = methods;
+ }
+ }
+
extension.afterMethodCall(call);
} finally {
typeCheckingContext.popEnclosingConstructorCall();
diff --git a/src/test/groovy/bugs/Groovy9327.groovy b/src/test/groovy/bugs/Groovy9327.groovy
new file mode 100644
index 0000000..7112f3f
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy9327.groovy
@@ -0,0 +1,60 @@
+/*
+ * 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 groovy.bugs
+
+import groovy.transform.CompileStatic
+import org.junit.Test
+
+import static groovy.test.GroovyAssert.shouldFail
+
+@CompileStatic
+final class Groovy9327 {
+
+ @Test
+ void testCheckedAIC() {
+ def err = shouldFail '''
+ @groovy.transform.TypeChecked
+ void test() {
+ def runner = new Runnable() {
+ @Override
+ void run() {
+ unknownReference
+ }
+ }
+ }
+ '''
+ assert err.message.contains('The variable [unknownReference] is undeclared.')
+ }
+
+ @Test
+ void testCompiledAIC() {
+ def err = shouldFail '''
+ @groovy.transform.CompileStatic
+ void test() {
+ def runner = new Runnable() {
+ @Override
+ void run() {
+ unknownReference
+ }
+ }
+ }
+ '''
+ assert err.message.contains('The variable [unknownReference] is undeclared.')
+ }
+}
diff --git a/src/test/groovy/transform/stc/AnonymousInnerClassSTCTest.groovy b/src/test/groovy/transform/stc/AnonymousInnerClassSTCTest.groovy
index ab1bb2e..822a712 100644
--- a/src/test/groovy/transform/stc/AnonymousInnerClassSTCTest.groovy
+++ b/src/test/groovy/transform/stc/AnonymousInnerClassSTCTest.groovy
@@ -151,9 +151,10 @@ class AnonymousInnerClassSTCTest extends StaticTypeCheckingTestCase {
}
}
s.size()
- }'''
+ }
+ '''
}
-
+
void testAICInAICInStaticMethod() {
assertScript '''
class A {