[groovy] 01/03: GROOVY-8169: preserve origin type of for loop variable

[su...@apache.org]

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

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

commit a4a6bb84e9f4f56ee7568fdc6f79b0e2bdf5af39
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Sat Jul 20 14:17:17 2019 -0500

    GROOVY-8169: preserve origin type of for loop variable
    
    (cherry picked from commit a7ed2174d003691dbadc3c31b8c4e2636a6f2b49)
---
 .../transform/sc/StaticCompilationVisitor.java     |  1 -
 src/test/groovy/bugs/Groovy8169.groovy             | 50 ++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java b/src/main/java/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java
index bc5ce96..f78f1c3 100644
--- a/src/main/java/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java
@@ -449,7 +449,6 @@ public class StaticCompilationVisitor extends StaticTypeCheckingVisitor {
                 componentType = inferLoopElementType(collectionType);
             }
             forLoop.getVariable().setType(componentType);
-            forLoop.getVariable().setOriginType(componentType);
         }
     }
 
diff --git a/src/test/groovy/bugs/Groovy8169.groovy b/src/test/groovy/bugs/Groovy8169.groovy
new file mode 100644
index 0000000..1db9c03
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy8169.groovy
@@ -0,0 +1,50 @@
+/*
+ * 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 groovy.transform.CompileStatic
+import org.junit.Test
+
+import static groovy.test.GroovyAssert.assertScript
+
+@CompileStatic
+final class Groovy8169 {
+
+    @Test
+    void testForLoopVariableRetainsOriginType() {
+        assertScript '''
+            import groovy.transform.*
+            import org.codehaus.groovy.ast.stmt.*
+            import static org.codehaus.groovy.ast.ClassHelper.*
+            import static org.codehaus.groovy.control.CompilePhase.*
+
+            @ASTTest(phase=CLASS_GENERATION, value={
+                def loop = node.code.statements.find { it instanceof ForStatement }
+                assert loop.variable.originType == OBJECT_TYPE
+                assert loop.variable.type == STRING_TYPE
+            })
+            @CompileStatic
+            void m() {
+                List strings = ['one', 'two']
+                for (Object s in strings) {
+                }
+            }
+        '''
+    }
+}