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 2020/06/08 15:43:56 UTC

[groovy] branch GROOVY-9558 created (now d7594c9)

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

emilles pushed a change to branch GROOVY-9558
in repository https://gitbox.apache.org/repos/asf/groovy.git.


      at d7594c9  GROOVY-9558: drop receiver metadata from transformed property expression

This branch includes the following new commits:

     new d7594c9  GROOVY-9558: drop receiver metadata from transformed property expression

The 1 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.



[groovy] 01/01: GROOVY-9558: drop receiver metadata from transformed property expression

Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

emilles pushed a commit to branch GROOVY-9558
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit d7594c9b288e5a9059bc350f9fa20d6b15337309
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Mon Jun 8 10:43:09 2020 -0500

    GROOVY-9558: drop receiver metadata from transformed property expression
---
 .../groovy/classgen/asm/sc/StaticInvocationWriter.java        |  2 +-
 .../sc/transformers/VariableExpressionTransformer.java        |  1 +
 src/test/groovy/transform/stc/ClosuresSTCTest.groovy          | 11 +++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java
index 9b1bcf0..9537de9 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java
@@ -659,7 +659,7 @@ public class StaticInvocationWriter extends InvocationWriter {
         if (implicitThis && implicitReceiver == null && origin instanceof MethodCallExpression) {
             implicitReceiver = ((MethodCallExpression) origin).getObjectExpression().getNodeMetaData(StaticTypesMarker.IMPLICIT_RECEIVER);
         }
-        if (implicitReceiver !=null && implicitThis) {
+        if (implicitThis && implicitReceiver != null) {
             String[] propertyPath = ((String) implicitReceiver).split("\\.");
             // GROOVY-6021
             PropertyExpression pexp = new PropertyExpression(new VariableExpression("this", CLOSURE_TYPE), propertyPath[0]);
diff --git a/src/main/java/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java b/src/main/java/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java
index d092b92..7f82336 100644
--- a/src/main/java/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java
+++ b/src/main/java/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java
@@ -67,6 +67,7 @@ public class VariableExpressionTransformer {
             receiver.putNodeMetaData(StaticTypesMarker.INFERRED_TYPE, owner);
             receiver.putNodeMetaData(StaticTypesMarker.IMPLICIT_RECEIVER, val);
         }
+        pexp.removeNodeMetaData(StaticTypesMarker.IMPLICIT_RECEIVER);
 
         return pexp;
     }
diff --git a/src/test/groovy/transform/stc/ClosuresSTCTest.groovy b/src/test/groovy/transform/stc/ClosuresSTCTest.groovy
index 108376d..80bd2bc 100644
--- a/src/test/groovy/transform/stc/ClosuresSTCTest.groovy
+++ b/src/test/groovy/transform/stc/ClosuresSTCTest.groovy
@@ -536,5 +536,16 @@ class ClosuresSTCTest extends StaticTypeCheckingTestCase {
             assert foo { -> 1 }  == 1
         '''
     }
+
+    // GROOVY-9558
+    void testPutAtClosureDelegateProperty() {
+        assertScript '''
+            def config = new org.codehaus.groovy.control.CompilerConfiguration()
+            config.tap {
+                optimizationOptions['indy'] = true
+                optimizationOptions.indy = true
+            }
+        '''
+    }
 }