groovy git commit: GROOVY-8439: @CompileStatic cannot compile generic class's static method

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

groovy git commit: GROOVY-8439: @CompileStatic cannot compile generic class's static method

Daniel.Sun
Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_6_X 17fb0de31 -> 7b73c6aeb


GROOVY-8439: @CompileStatic cannot compile generic class's static method


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/7b73c6ae
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/7b73c6ae
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/7b73c6ae

Branch: refs/heads/GROOVY_2_6_X
Commit: 7b73c6aeb2d399512b6cdfbb6ff4fbef59c33f9a
Parents: 17fb0de
Author: danielsun1106 <[hidden email]>
Authored: Sat Mar 10 22:16:06 2018 +0800
Committer: danielsun1106 <[hidden email]>
Committed: Sat Mar 10 22:36:38 2018 +0800

----------------------------------------------------------------------
 .../stc/StaticTypeCheckingSupport.java          | 14 +++--
 .../stc/StaticTypeCheckingVisitor.java          |  2 +
 src/test/groovy/bugs/Groovy8439Bug.groovy       | 63 ++++++++++++++++++++
 3 files changed, 75 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/7b73c6ae/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
index 5f0e983..57cec53 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
@@ -2021,10 +2021,16 @@ public abstract class StaticTypeCheckingSupport {
     }
 
     static Map<String, GenericsType> extractGenericsParameterMapOfThis(MethodNode mn) {
-        if (mn==null) return null;
-        Map<String, GenericsType> map = getGenericsParameterMapOfThis(mn.getDeclaringClass());
-        map = mergeGenerics(map, mn.getGenericsTypes());
-        return map;
+        if (mn == null) return null;
+
+        Map<String, GenericsType> map;
+        if (mn.isStatic()) {
+            map = new HashMap<>();
+        } else {
+            map = getGenericsParameterMapOfThis(mn.getDeclaringClass());
+        }
+
+        return mergeGenerics(map, mn.getGenericsTypes());
     }
 
     private static Map<String, GenericsType> mergeGenerics(Map<String, GenericsType> current, GenericsType[] newGenerics) {

http://git-wip-us.apache.org/repos/asf/groovy/blob/7b73c6ae/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
----------------------------------------------------------------------
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 28a7ca4..6ff0dd7 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -2738,6 +2738,7 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
                             }
                     }
                     boolean lastArg = i == length - 1;
+
                     if (lastArg && inferredType.isArray()) {
                         if (inferredType.getComponentType().equals(originType)) {
                             inferredType = originType;
@@ -2745,6 +2746,7 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
                     } else if (!typeCheckMethodArgumentWithGenerics(originType, inferredType, lastArg)) {
                         addError("Expected parameter of type "+ inferredType.toString(false)+" but got "+originType.toString(false), closureParam.getType());
                     }
+
                     typeCheckingContext.controlStructureVariables.put(closureParam, inferredType);
                 }
             }

http://git-wip-us.apache.org/repos/asf/groovy/blob/7b73c6ae/src/test/groovy/bugs/Groovy8439Bug.groovy
----------------------------------------------------------------------
diff --git a/src/test/groovy/bugs/Groovy8439Bug.groovy b/src/test/groovy/bugs/Groovy8439Bug.groovy
new file mode 100644
index 0000000..13af477
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy8439Bug.groovy
@@ -0,0 +1,63 @@
+/*
+ *  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
+
+class Groovy8439Bug extends GroovyTestCase {
+    void testSTCGenerics() {
+        assertScript '''
+        import groovy.transform.CompileStatic
+        @CompileStatic
+        class Test<T extends Task> {
+            static def something(Task task, Collection<BaseVariant> variants) {
+                variants.collectMany { it.sourceFolders }.collect { ConfigurableFileTree tree ->
+                    task.getBuildDir().toPath().relativize(tree.dir.toPath()).toString() + File.separator
+                }
+            }
+        }
+        
+        interface BaseVariant {
+            List<ConfigurableFileTree> getSourceFolders()
+        }
+        
+        interface ConfigurableFileTree {
+            File getDir()
+        }
+        
+        interface Task {
+            File getBuildDir()
+        }
+        
+        Test.something(null, [])
+        '''
+    }
+
+    void testSTCGenerics2() {
+        assertScript '''
+        import groovy.transform.CompileStatic
+        @CompileStatic
+        class Test<T extends Map> {
+            static def something(List<String> strList) {
+                strList.collect { "hello,$it" }
+            }
+        }
+        
+        assert ["hello,Jochen", "hello,Paul", "hello,Daniel"] == Test.something(["Jochen", "Paul", "Daniel"])
+        '''
+    }
+}

Daniel Sun
Apache Groovy committer

Blog: http://blog.sunlan.me
Twitter: @daniel_sun