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 2023/03/27 15:25:42 UTC
[groovy] branch GROOVY_4_0_X updated: GROOVY-10981: STC: keep legacy preference of field over dynamic property
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
The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push:
new cfedf08b12 GROOVY-10981: STC: keep legacy preference of field over dynamic property
cfedf08b12 is described below
commit cfedf08b1283c420facfb035ff0395da70b3aaf0
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Mon Mar 27 09:33:18 2023 -0500
GROOVY-10981: STC: keep legacy preference of field over dynamic property
---
.../transform/stc/StaticTypeCheckingVisitor.java | 6 ++++--
.../typing/TypeCheckingExtensionSpecTest.groovy | 19 ----------------
.../stc/FieldsAndPropertiesSTCTest.groovy | 25 ++++++++++++++++++++++
3 files changed, 29 insertions(+), 21 deletions(-)
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 5f1ccb726b..5cd1dbc611 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -625,11 +625,13 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
addStaticTypeError("The variable [" + name + "] is undeclared.", vexp);
}
} else if (accessedVariable instanceof FieldNode) {
+ FieldNode accessedField = (FieldNode) accessedVariable;
ClassNode temporaryType = getInferredTypeFromTempInfo(vexp, null); // GROOVY-9454
if (enclosingClosure != null) {
tryVariableExpressionAsProperty(vexp, name);
- } else if (((FieldNode) accessedVariable).getDeclaringClass() == typeCheckingContext.getEnclosingClassNode() || !tryVariableExpressionAsProperty(vexp, name)) {
- checkOrMarkPrivateAccess(vexp, (FieldNode) accessedVariable, typeCheckingContext.isTargetOfEnclosingAssignment(vexp));
+ } else if (getOutermost(accessedField.getDeclaringClass()) == getOutermost(typeCheckingContext.getEnclosingClassNode())
+ || !tryVariableExpressionAsProperty(vexp, name)) { // GROOVY-10981: check for property before super class field
+ checkOrMarkPrivateAccess(vexp, accessedField, typeCheckingContext.isTargetOfEnclosingAssignment(vexp));
if (temporaryType == null) storeType(vexp, getType(vexp));
}
if (temporaryType != null && !isObjectType(temporaryType)) {
diff --git a/src/spec/test/typing/TypeCheckingExtensionSpecTest.groovy b/src/spec/test/typing/TypeCheckingExtensionSpecTest.groovy
index 338f1019f6..67f8bbe8e4 100644
--- a/src/spec/test/typing/TypeCheckingExtensionSpecTest.groovy
+++ b/src/spec/test/typing/TypeCheckingExtensionSpecTest.groovy
@@ -591,25 +591,6 @@ new DelegateTest().delegate()
'''
}
- void testDelegateVariableFromDifferentOwningClass() {
- assertScript '''
- @groovy.transform.CompileStatic
- class A {
- static private int MAX_LINES = 2
- static class B {
- @Delegate
- private Map<String, Object> delegate = [:]
- void m(int c) {
- if (c > A.MAX_LINES) {
- return
- }
- }
- }
- }
- null
- '''
- }
-
//--------------------------------------------------------------------------
private static assertScriptWithExtension(String extensionName, String script,
diff --git a/src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy b/src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy
index b33d917892..14525b1086 100644
--- a/src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy
+++ b/src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy
@@ -813,6 +813,31 @@ class FieldsAndPropertiesSTCTest extends StaticTypeCheckingTestCase {
'''
}
+ // GROOVY-10981, GROOVY-10985
+ void testOuterPropertyAccess9() {
+ for (propertySource in [
+ 'def get(String name){if(name=="VALUE")return 2}',
+ 'def getProperty(String name){if(name=="VALUE")return 2}',
+ '@Delegate private Map<String,Object> map = [VALUE:2]']) {
+ assertScript """
+ class Outer {
+ static private int VALUE = 1
+ static class Inner {
+ $propertySource
+ int test(int i) {
+ if (i > VALUE) {
+ // ...
+ }
+ return VALUE
+ }
+ }
+ }
+ Number value = new Outer.Inner().test(0)
+ assert value == 1 // this is legacy result
+ """
+ }
+ }
+
void testPrivateFieldAccessInAIC() {
assertScript '''
class C {