[groovy] branch GROOVY_4_0_X updated: GROOVY-9980: visit annotation expression before values

[su...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sunlan 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 06af450a85 GROOVY-9980: visit annotation expression before values
06af450a85 is described below

commit 06af450a85e0ca24ddc2788f19f3709e9699b931
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Tue Jul 5 10:30:38 2022 -0500

    GROOVY-9980: visit annotation expression before values
    
    (cherry picked from commit 219d2914cc6891abf25e15ec09d7a9c7230b30ad)
---
 .../codehaus/groovy/ast/expr/AnnotationConstantExpression.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java
index b93f0c7a2a..27ad9593ef 100644
--- a/src/main/java/org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java
+++ b/src/main/java/org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java
@@ -28,19 +28,21 @@ import java.util.Map;
  * (mainly used as a marker).
  */
 public class AnnotationConstantExpression extends ConstantExpression {
-    public AnnotationConstantExpression(AnnotationNode node) {
+
+    public AnnotationConstantExpression(final AnnotationNode node) {
         super(node);
         setType(node.getClassNode());
     }
 
     @Override
-    public void visit(GroovyCodeVisitor visitor) {
+    public void visit(final GroovyCodeVisitor visitor) {
+        super.visit(visitor); // GROOVY-9980
+
         AnnotationNode node = (AnnotationNode) getValue();
         Map<String, Expression> attrs = node.getMembers();
         for (Expression expr : attrs.values()) {
             expr.visit(visitor);
         }
-        super.visit(visitor);
     }
 
     @Override