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/19 16:33:13 UTC

[groovy] branch GROOVY_2_5_X updated (02a5642 -> 2e09796)

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

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


    from 02a5642  fix test
     new 38c9bd5  GROOVY-8448: "this.name" from anon. inner class
     new 2e09796  GROOVY-8840: use inferred type for subscript if operand is placeholder

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   |  2 +-
 .../groovy/classgen/AsmClassGenerator.java         |  9 +++-
 .../classgen/asm/BinaryExpressionHelper.java       |  4 ++
 src/test/gls/innerClass/InnerClassTest.groovy      | 15 +++++++
 .../stc/DefaultGroovyMethodsSTCTest.groovy         | 50 ++++++++++++++++++++++
 5 files changed, 77 insertions(+), 3 deletions(-)

[groovy] 02/02: GROOVY-8840: use inferred type for subscript if operand is placeholder

Posted by em...@apache.org.
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 2e097963d2f21a5b0a227f304fd223adda5b9b07
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Fri Feb 18 16:13:42 2022 -0600

    GROOVY-8840: use inferred type for subscript if operand is placeholder
    
    Conflicts:
    	src/main/java/org/codehaus/groovy/classgen/asm/BinaryExpressionHelper.java
---
 .../codehaus/groovy/ast/tools/GenericsUtils.java   |  2 +-
 .../classgen/asm/BinaryExpressionHelper.java       |  4 ++
 .../stc/DefaultGroovyMethodsSTCTest.groovy         | 50 ++++++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)

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 93d1a35..47d6d86 100644
--- a/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
+++ b/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
@@ -922,7 +922,7 @@ public class GenericsUtils {
         return result;
     }
 
-    private static boolean hasPlaceHolders(ClassNode parameterizedType) {
+    public static boolean hasPlaceHolders(ClassNode parameterizedType) {
         return checkPlaceHolders(parameterizedType, new Predicate<GenericsType>() {
             @Override
             public boolean test(GenericsType genericsType) {
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryExpressionHelper.java b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryExpressionHelper.java
index 12f0cd3..63b105c 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryExpressionHelper.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryExpressionHelper.java
@@ -39,6 +39,7 @@ import org.codehaus.groovy.ast.expr.PropertyExpression;
 import org.codehaus.groovy.ast.expr.TernaryExpression;
 import org.codehaus.groovy.ast.expr.TupleExpression;
 import org.codehaus.groovy.ast.expr.VariableExpression;
+import org.codehaus.groovy.ast.tools.GenericsUtils;
 import org.codehaus.groovy.ast.tools.WideningCategories;
 import org.codehaus.groovy.classgen.AsmClassGenerator;
 import org.codehaus.groovy.classgen.BytecodeExpression;
@@ -715,6 +716,9 @@ public class BinaryExpressionHelper {
                 Expression subscript = be.getRightExpression();
                 subscript.visit(controller.getAcg());
                 ClassNode subscriptType = operandStack.getTopOperand();
+                if (subscriptType.isGenericsPlaceHolder() || GenericsUtils.hasPlaceHolders(subscriptType)) {
+                    subscriptType = controller.getTypeChooser().resolveType(be, controller.getClassNode());
+                }
                 int id = controller.getCompileStack().defineTemporaryVariable("$subscript", subscriptType, true);
                 VariableSlotLoader subscriptExpression = new VariableSlotLoader(subscriptType, id, operandStack);
                 // do modified visit
diff --git a/src/test/groovy/transform/stc/DefaultGroovyMethodsSTCTest.groovy b/src/test/groovy/transform/stc/DefaultGroovyMethodsSTCTest.groovy
index 81eb450..11caeb0 100644
--- a/src/test/groovy/transform/stc/DefaultGroovyMethodsSTCTest.groovy
+++ b/src/test/groovy/transform/stc/DefaultGroovyMethodsSTCTest.groovy
@@ -201,4 +201,54 @@ class DefaultGroovyMethodsSTCTest extends StaticTypeCheckingTestCase {
         '''
     }
 
+    void testListGetAtNext() {
+        assertScript '''
+            def test() {
+                def list = [0, 1, 2, 3]
+                for (i in 1..2) {
+                    list[i-1]++
+                }
+                list
+            }
+            assert test() == [1, 2, 2, 3]
+        '''
+    }
+
+    // GROOVY-8840
+    void testListGetAtGetAtNext() {
+        assertScript '''
+            def test() {
+                def list = [0, 1, 2, 3]
+                List<Integer> other = [1]
+                list[other[0]]++
+                //   ^^^^^^^^ puts T on operand stack, not int/Integer
+                list
+            }
+            assert test() == [0, 2, 2, 3]
+        '''
+    }
+
+    void testListGetAtGetAtNext2() {
+        assertScript '''
+            def test() {
+                def list = [0, 1, 2, 3]
+                List<Integer> other = [1]
+                list[(int)other[0]]++
+                list
+            }
+            assert test() == [0, 2, 2, 3]
+        '''
+    }
+
+    void testListGetAtFirstNext() {
+        assertScript '''
+            def test() {
+                def list = [0, 1, 2, 3]
+                List<Integer> other = [1]
+                list[other.first()]++
+                list
+            }
+            assert test() == [0, 2, 2, 3]
+        '''
+    }
 }

[groovy] 01/02: GROOVY-8448: "this.name" from anon. inner class

Posted by em...@apache.org.
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 38c9bd5ae655fbb3449003ed91274cf2caa2c51f
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Fri Feb 18 16:12:40 2022 -0600

    GROOVY-8448: "this.name" from anon. inner class
    
    Conflicts:
    	src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
---
 .../org/codehaus/groovy/classgen/AsmClassGenerator.java   |  9 +++++++--
 src/test/gls/innerClass/InnerClassTest.groovy             | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java b/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
index 3a9f58a..707695d 100644
--- a/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
+++ b/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
@@ -1044,8 +1044,14 @@ public class AsmClassGenerator extends ClassGenerator {
                             }
                         }
                     }
+                    // GROOVY-8448: "this.name" from anon. inner class
+                    if (field != null && !expression.isImplicitThis()
+                            && (field.getModifiers() & ACC_SYNTHETIC) != 0
+                            && field.getType().equals(ClassHelper.REFERENCE_TYPE)) {
+                        field = null;
+                    }
+                    // GROOVY-5259, GROOVY-9501, GROOVY-9569, GROOVY-9650, GROOVY-9655, GROOVY-9665, GROOVY-9683, GROOVY-9695
                     if (field == null && !isFieldDirectlyAccessible(classNode.getField(name), classNode)) {
-                        // GROOVY-5259, GROOVY-9501, GROOVY-9569
                         if (checkStaticOuterField(expression, name)) return;
                     }
                 }
@@ -1189,7 +1195,6 @@ public class AsmClassGenerator extends ClassGenerator {
         int mark = operandStack.getStackLength()-1;
         MethodCallerMultiAdapter adapter;
         if (controller.getCompileStack().isLHS()) {
-            //operandStack.box();
             adapter = setProperty;
             if (isGroovyObject(objectExpression)) adapter = setGroovyObjectProperty;
             if (isThisOrSuperInStaticContext(objectExpression)) adapter = setProperty;
diff --git a/src/test/gls/innerClass/InnerClassTest.groovy b/src/test/gls/innerClass/InnerClassTest.groovy
index 64bce3e..362947a 100644
--- a/src/test/gls/innerClass/InnerClassTest.groovy
+++ b/src/test/gls/innerClass/InnerClassTest.groovy
@@ -49,6 +49,21 @@ final class InnerClassTest {
         '''
     }
 
+    @Test // GROOVY-8448
+    void testAccessLocalVariableVsGetterInAIC() {
+        assertScript '''
+            def x = 'local' // shared variable written as field in AIC
+            def c = new java.util.concurrent.Callable<String>() {
+                def getX() { 'getter' }
+                @Override String call() {
+                    x + ' then ' + this.x
+                }
+            }
+            String result = c()
+            assert result == 'local then getter'
+        '''
+    }
+
     @Test
     void testAccessLocalVariableFromClosureInAIC() {
         assertScript '''