[groovy] branch master updated: Temp revert "GROOVY-10339: STC: incorporate additional type witnesses for method call"

[paulk]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 9b55c73  Temp revert "GROOVY-10339: STC: incorporate additional type 
witnesses for method call"
9b55c73 is described below

commit 9b55c7392a8a6d7992fe699928b6f23c5d1b2a4d
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Nov 6 07:31:01 2021 +1000

    Temp revert "GROOVY-10339: STC: incorporate additional type witnesses for 
method call"
    
    This reverts commit 070063f24df8936c1af8e168a14634219f548905.
---
 .../groovy/transform/stc/StaticTypeCheckingVisitor.java      |  5 +----
 src/test/groovy/transform/stc/GenericsSTCTest.groovy         | 12 ------------
 2 files changed, 1 insertion(+), 16 deletions(-)

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 4a26bf9..af6d035 100644
--- 
a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ 
b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -5352,10 +5352,7 @@ public class StaticTypeCheckingVisitor extends 
ClassCodeVisitorSupport {
                         Map<GenericsTypeName, GenericsType> connections = new 
HashMap<>();
                         extractGenericsConnections(connections, 
wrapTypeIfNecessary(argumentType), paramType);
                         connections.forEach((gtn, gt) -> 
resolvedPlaceholders.merge(gtn, gt, (gt1, gt2) -> {
-                            // GROOVY-10339: incorporate additional witness
-                            ClassNode cn1 = makeClassSafe0(CLASS_Type, gt1);
-                            ClassNode cn2 = makeClassSafe0(CLASS_Type, gt2);
-                            return 
lowestUpperBound(cn1,cn2).getGenericsTypes()[0];
+                            return gt2; // TODO
                         }));
                     }
                 }
diff --git a/src/test/groovy/transform/stc/GenericsSTCTest.groovy 
b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
index 9482905..9790d26 100644
--- a/src/test/groovy/transform/stc/GenericsSTCTest.groovy
+++ b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
@@ -559,18 +559,6 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
         '''
     }
 
-    // GROOVY-10339
-    void testReturnTypeInferenceWithMethodGenerics21() {
-        shouldFailWithMessages '''
-            String foo() {
-            }
-            def <T> T bar(T x, T y) {
-            }
-            Integer i = bar(foo(), 1)
-        ''',
-        'Cannot assign value of type'
-    }
-
     void testDiamondInferrenceFromConstructor1() {
         assertScript '''
             class Foo<U> {