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/03/08 21:09:58 UTC
[groovy] branch GROOVY_4_0_X updated (d430896 -> 344399d)
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a change to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from d430896 Update dep metadata
new c838a1d GROOVY-9866, GROOVY-10466: resolve all class headers before class bodies
new 344399d STC: alignment of source and target
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../codehaus/groovy/ast/tools/GenericsUtils.java | 12 +---
.../codehaus/groovy/control/CompilationUnit.java | 22 ++++++-
.../codehaus/groovy/control/ResolveVisitor.java | 70 ++++++++++++----------
.../transform/stc/StaticTypeCheckingSupport.java | 15 +++--
.../transform/stc/StaticTypeCheckingVisitor.java | 5 +-
.../bugs/{Groovy9245.groovy => Groovy10466.groovy} | 49 +++++++--------
src/test/groovy/script/RuntimeResolveTests.groovy | 3 +-
.../groovy/transform/stc/GenericsSTCTest.groovy | 6 +-
8 files changed, 95 insertions(+), 87 deletions(-)
copy src/test/groovy/bugs/{Groovy9245.groovy => Groovy10466.groovy} (55%)
[groovy] 01/02: GROOVY-9866, GROOVY-10466: resolve all class headers before class bodies
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit c838a1dd43a4493f6082dd332cda7232e1de362c
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Fri Mar 4 18:16:04 2022 -0600
GROOVY-9866, GROOVY-10466: resolve all class headers before class bodies
---
.../codehaus/groovy/control/CompilationUnit.java | 22 ++++++-
.../codehaus/groovy/control/ResolveVisitor.java | 70 ++++++++++++----------
src/test/groovy/bugs/Groovy10466.groovy | 65 ++++++++++++++++++++
src/test/groovy/script/RuntimeResolveTests.groovy | 3 +-
4 files changed, 122 insertions(+), 38 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/control/CompilationUnit.java b/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
index a619a2f..0780a21 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
@@ -199,9 +199,25 @@ public class CompilationUnit extends ProcessingUnit {
}, Phases.CONVERSION);
addPhaseOperation(source -> {
- resolveVisitor.setClassNodeResolver(classNodeResolver);
- for (ClassNode classNode : source.getAST().getClasses()) {
- resolveVisitor.startResolving(classNode, source);
+ try {
+ resolveVisitor.phase = 1; // resolve head of each class
+ resolveVisitor.setClassNodeResolver(classNodeResolver);
+ for (ClassNode classNode : source.getAST().getClasses()) {
+ resolveVisitor.startResolving(classNode, source);
+ }
+ } finally {
+ resolveVisitor.phase = 0;
+ }
+ }, Phases.SEMANTIC_ANALYSIS);
+
+ addPhaseOperation(source -> {
+ try {
+ resolveVisitor.phase = 2; // resolve body of each class
+ for (ClassNode classNode : source.getAST().getClasses()) {
+ resolveVisitor.startResolving(classNode, source);
+ }
+ } finally {
+ resolveVisitor.phase = 0;
}
}, Phases.SEMANTIC_ANALYSIS);
diff --git a/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java b/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
index 8780da2..e639d26 100644
--- a/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
+++ b/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
@@ -113,6 +113,7 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
private boolean checkingVariableTypeInDeclaration;
private boolean inClosure, inPropertyExpression;
private boolean isTopLevelProperty = true;
+ /*package*/ int phase; // sub-divide visit
/**
* A ConstructedNestedClass consists of an outer class and a name part, denoting a
@@ -423,7 +424,6 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
// GROOVY-4043: for type "X", try "A$X" with each type in the class hierarchy (except for Object)
for (; cn != null && cycleCheck.add(cn) && !isObjectType(cn); cn = cn.getSuperClass()) {
if (setRedirect(type, cn)) return true;
- // GROOVY-9866: unresolvable interfaces
}
// Another case we want to check here is if we are in a
@@ -1316,46 +1316,50 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
genericParameterNames = new HashMap<>();
}
resolveGenericsHeader(node.getGenericsTypes());
+ switch (phase) { // GROOVY-9866, GROOVY-10466
+ case 0:
+ case 1:
+ ClassNode sn = node.getUnresolvedSuperClass();
+ if (sn != null) {
+ resolveOrFail(sn, "", node, true);
+ }
+ for (ClassNode in : node.getInterfaces()) {
+ resolveOrFail(in, "", node, true);
+ }
- ClassNode sn = node.getUnresolvedSuperClass();
- if (sn != null) {
- resolveOrFail(sn, "", node, true);
- }
- for (ClassNode in : node.getInterfaces()) {
- resolveOrFail(in, "", node, true);
- }
-
- if (sn != null) checkCyclicInheritance(node, sn);
- for (ClassNode in : node.getInterfaces()) {
- checkCyclicInheritance(node, in);
- }
- if (node.getGenericsTypes() != null) {
- for (GenericsType gt : node.getGenericsTypes()) {
- if (gt != null && gt.getUpperBounds() != null) {
- for (ClassNode variant : gt.getUpperBounds()) {
- if (variant.isGenericsPlaceHolder()) checkCyclicInheritance(variant, gt.getType());
+ if (sn != null) checkCyclicInheritance(node, sn);
+ for (ClassNode in : node.getInterfaces()) {
+ checkCyclicInheritance(node, in);
+ }
+ if (node.getGenericsTypes() != null) {
+ for (GenericsType gt : node.getGenericsTypes()) {
+ if (gt != null && gt.getUpperBounds() != null) {
+ for (ClassNode variant : gt.getUpperBounds()) {
+ if (variant.isGenericsPlaceHolder()) checkCyclicInheritance(variant, gt.getType());
+ }
}
}
}
- }
-
- // VariableScopeVisitor visits anon. inner class body inline, so resolve now
- for (Iterator<InnerClassNode> it = node.getInnerClasses(); it.hasNext(); ) {
- InnerClassNode cn = it.next();
- if (cn.isAnonymous()) {
- MethodNode enclosingMethod = cn.getEnclosingMethod();
- if (enclosingMethod != null) {
- resolveGenericsHeader(enclosingMethod.getGenericsTypes()); // GROOVY-6977
+ case 2:
+ // VariableScopeVisitor visits anon. inner class body inline, so resolve now
+ for (Iterator<InnerClassNode> it = node.getInnerClasses(); it.hasNext(); ) {
+ InnerClassNode cn = it.next();
+ if (cn.isAnonymous()) {
+ MethodNode enclosingMethod = cn.getEnclosingMethod();
+ if (enclosingMethod != null) {
+ resolveGenericsHeader(enclosingMethod.getGenericsTypes()); // GROOVY-6977
+ }
+ resolveOrFail(cn.getUnresolvedSuperClass(false), cn); // GROOVY-9642
}
- resolveOrFail(cn.getUnresolvedSuperClass(false), cn); // GROOVY-9642
}
- }
- // initialize scopes/variables now that imports and super types are resolved
- new VariableScopeVisitor(source).visitClass(node);
+ if (phase == 1) break; // resolve other class headers before members, et al.
- visitTypeAnnotations(node);
- super.visitClass(node);
+ // initialize scopes/variables now that imports and super types are resolved
+ new VariableScopeVisitor(source).visitClass(node);
+ visitTypeAnnotations(node);
+ super.visitClass(node);
+ }
currentClass = oldNode;
}
diff --git a/src/test/groovy/bugs/Groovy10466.groovy b/src/test/groovy/bugs/Groovy10466.groovy
new file mode 100644
index 0000000..704682c
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy10466.groovy
@@ -0,0 +1,65 @@
+/*
+ * 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 org.codehaus.groovy.control.CompilationUnit
+import org.codehaus.groovy.control.CompilerConfiguration
+import org.junit.Test
+
+class Groovy10466 {
+
+ protected field
+
+ @Test
+ void testClassOrder() {
+ def config = new CompilerConfiguration(targetDirectory: File.createTempDir())
+
+ def parentDir = File.createTempDir()
+ try {
+ def a = new File(parentDir, 'A.groovy')
+ a.write '''
+ import org.codehaus.groovy.ast.FieldNode
+
+ class A extends B {
+ @groovy.transform.ASTTest(value={
+ def mce = node.code.statements[0].expression
+ def var = mce.arguments[0] // "field" variable
+ assert var.accessedVariable instanceof FieldNode
+ })
+ void test() {
+ print field
+ }
+ }
+ '''
+ def b = new File(parentDir, 'B.groovy')
+ b.write '''
+ class B extends groovy.bugs.Groovy10466 {
+ }
+ '''
+
+ def loader = new GroovyClassLoader(this.class.classLoader)
+ def cu = new CompilationUnit(config, null, loader)
+ cu.addSources(a, b)
+ cu.compile()
+ } finally {
+ config.targetDirectory.deleteDir()
+ parentDir.deleteDir()
+ }
+ }
+}
diff --git a/src/test/groovy/script/RuntimeResolveTests.groovy b/src/test/groovy/script/RuntimeResolveTests.groovy
index 61462bc..32acab6 100644
--- a/src/test/groovy/script/RuntimeResolveTests.groovy
+++ b/src/test/groovy/script/RuntimeResolveTests.groovy
@@ -18,7 +18,6 @@
*/
package groovy.script
-import org.junit.Ignore
import org.junit.Test
import static groovy.test.GroovyAssert.isAtLeastJdk
@@ -67,7 +66,7 @@ final class RuntimeResolveTests {
runScript('/groovy/bugs/groovy9243/Main.groovy')
}
- @Test @Ignore
+ @Test
void testResolveOuterMemberWithoutAnImport3() {
assumeTrue(isAtLeastJdk('9.0')) // System.Logger
runScript('/groovy/bugs/groovy9866/Main.groovy')
[groovy] 02/02: STC: alignment of source and target
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 344399df1e7e2edf5e8e330a868390f5cd2e8540
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Tue Mar 8 12:17:47 2022 -0600
STC: alignment of source and target
---
.../java/org/codehaus/groovy/ast/tools/GenericsUtils.java | 12 ++----------
.../groovy/transform/stc/StaticTypeCheckingSupport.java | 15 +++++++--------
.../groovy/transform/stc/StaticTypeCheckingVisitor.java | 5 ++++-
src/test/groovy/transform/stc/GenericsSTCTest.groovy | 6 +++---
4 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java b/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
index 8e9d9bb..fd3cbc9 100644
--- a/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
+++ b/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
@@ -555,16 +555,8 @@ public class GenericsUtils {
}
}
- public static ClassNode getSuperClass(ClassNode type, ClassNode target) {
- ClassNode superClass = ClassHelper.getNextSuperClass(type, target);
-
- if (superClass == null) {
- if (ClassHelper.isPrimitiveType(type)) {
- superClass = ClassHelper.getNextSuperClass(ClassHelper.getWrapper(type), target);
- }
- }
-
- return superClass;
+ public static ClassNode getSuperClass(final ClassNode type, final ClassNode target) {
+ return ClassHelper.getNextSuperClass(ClassHelper.isPrimitiveType(type) ? ClassHelper.getWrapper(type) : type, target);
}
private static void extractSuperClassGenerics(final GenericsType[] usage, final GenericsType[] declaration, final Map<String, ClassNode> spec) {
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
index dbee960..ce00d87 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
@@ -100,6 +100,7 @@ import static org.codehaus.groovy.ast.ClassHelper.char_TYPE;
import static org.codehaus.groovy.ast.ClassHelper.double_TYPE;
import static org.codehaus.groovy.ast.ClassHelper.findSAM;
import static org.codehaus.groovy.ast.ClassHelper.float_TYPE;
+import static org.codehaus.groovy.ast.ClassHelper.getNextSuperClass;
import static org.codehaus.groovy.ast.ClassHelper.getUnwrapper;
import static org.codehaus.groovy.ast.ClassHelper.getWrapper;
import static org.codehaus.groovy.ast.ClassHelper.int_TYPE;
@@ -120,7 +121,6 @@ import static org.codehaus.groovy.ast.ClassHelper.make;
import static org.codehaus.groovy.ast.ClassHelper.makeWithoutCaching;
import static org.codehaus.groovy.ast.ClassHelper.short_TYPE;
import static org.codehaus.groovy.ast.ClassHelper.void_WRAPPER_TYPE;
-import static org.codehaus.groovy.ast.tools.GenericsUtils.makeClassSafe0;
import static org.codehaus.groovy.ast.tools.WideningCategories.isBigIntCategory;
import static org.codehaus.groovy.ast.tools.WideningCategories.isFloatingCategory;
import static org.codehaus.groovy.ast.tools.WideningCategories.isNumberCategory;
@@ -1454,7 +1454,7 @@ public abstract class StaticTypeCheckingSupport {
// GROOVY-8034: non-static method may use class generics
gts = applyGenericsContext(candidateGenerics, gts);
}
- GenericsUtils.extractPlaceholders(makeClassSafe0(OBJECT_TYPE, gts), candidateGenerics);
+ GenericsUtils.extractPlaceholders(GenericsUtils.makeClassSafe0(OBJECT_TYPE, gts), candidateGenerics);
// the outside context parts till now define placeholder we are not allowed to
// generalize, thus we save that for later use...
@@ -1734,12 +1734,11 @@ public abstract class StaticTypeCheckingSupport {
ClassNode returnType = StaticTypeCheckingVisitor.wrapTypeIfNecessary(GenericsUtils.parameterizeSAM(target).getV2());
extractGenericsConnections(connections, type.getGenericsTypes(), new GenericsType[] {returnType.asGenericsType()});
- } else if (type.equals(target) || !implementsInterfaceOrIsSubclassOf(type, target)) {
+ } else if (type.equals(target)) {
extractGenericsConnections(connections, type.getGenericsTypes(), target.getGenericsTypes());
- } else {
- // find matching super class or interface
- ClassNode superClass = GenericsUtils.getSuperClass(type, target);
+ } else if (implementsInterfaceOrIsSubclassOf(type, target)) {
+ ClassNode superClass = getNextSuperClass(type, target);
if (superClass != null) {
if (GenericsUtils.hasUnresolvedGenerics(superClass)) {
Map<String, ClassNode> spec = GenericsUtils.createGenericsSpec(type);
@@ -1922,8 +1921,8 @@ public abstract class StaticTypeCheckingSupport {
}
static GenericsType getCombinedGenericsType(final GenericsType gt1, final GenericsType gt2) {
- ClassNode cn1 = makeClassSafe0(CLASS_Type, gt1);
- ClassNode cn2 = makeClassSafe0(CLASS_Type, gt2);
+ ClassNode cn1 = GenericsUtils.makeClassSafe0(CLASS_Type, gt1);
+ ClassNode cn2 = GenericsUtils.makeClassSafe0(CLASS_Type, gt2);
ClassNode lub = lowestUpperBound(cn1,cn2);
return lub.getGenericsTypes()[0];
}
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 854a267..87cf0f7 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -863,7 +863,10 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
} else if (!resultType.isGenericsPlaceHolder()) { // GROOVY-10324
Map<GenericsTypeName, GenericsType> gt = new HashMap<>();
extractGenericsConnections(gt, resultType, resultType.redirect());
- extractGenericsConnections(gt, lType, getNextSuperClass(resultType, lType));
+ ClassNode sc = resultType;
+ do { sc = getNextSuperClass(sc, lType);
+ } while (sc != null && !sc.equals(lType));
+ extractGenericsConnections(gt, lType, sc);
resultType = applyGenericsContext(gt, resultType.redirect());// GROOVY-10235, et al.
}
diff --git a/src/test/groovy/transform/stc/GenericsSTCTest.groovy b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
index 0e2559f..a372aa3 100644
--- a/src/test/groovy/transform/stc/GenericsSTCTest.groovy
+++ b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
@@ -2443,10 +2443,10 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
assertScript '''
@ASTTest(phase=INSTRUCTION_SELECTION, value={
def ift = node.getNodeMetaData(INFERRED_TYPE)
- assert ift == make(List)
- assert ift.isUsingGenerics()
+ assert ift == LIST_TYPE
def gts = ift.genericsTypes
- assert gts.length==1
+ assert gts != null
+ assert gts.length == 1
assert gts[0].type == STRING_TYPE
})
Iterable<String> list = (List) null