[groovy] branch master updated: GROOVY-10324: STC: don't erase placeholder information

[emilles]

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

emilles 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 e685390  GROOVY-10324: STC: don't erase placeholder information
e685390 is described below

commit e685390fbd77c9b24986ba24044cd84841c5d579
Author: Eric Milles <eric.mil...@thomsonreuters.com>
AuthorDate: Mon Nov 1 13:55:37 2021 -0500

    GROOVY-10324: STC: don't erase placeholder information
---
 .../org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java  | 4 ++--
 src/test/groovy/transform/stc/GenericsSTCTest.groovy                  | 2 +-
 2 files changed, 3 insertions(+), 3 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 ee72e98..83689c2 100644
--- 
a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ 
b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -859,12 +859,12 @@ public class StaticTypeCheckingVisitor extends 
ClassCodeVisitorSupport {
                     // "completed" with generics type information available 
from the LHS
                     if (lType.equals(resultType)) {
                         if (!lType.isGenericsPlaceHolder()) resultType = lType;
-                    } else { // GROOVY-10235, et al.
+                    } else if (!resultType.isGenericsPlaceHolder()) { // 
GROOVY-10324
                         Map<GenericsTypeName, GenericsType> gt = new 
HashMap<>();
                         extractGenericsConnections(gt, resultType, 
resultType.redirect());
                         extractGenericsConnections(gt, lType, 
getNextSuperClass(resultType, lType));
 
-                        resultType = applyGenericsContext(gt, 
resultType.redirect());
+                        resultType = applyGenericsContext(gt, 
resultType.redirect());// GROOVY-10235, et al.
                     }
                 }
 
diff --git a/src/test/groovy/transform/stc/GenericsSTCTest.groovy 
b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
index 2babe93..cc08e6f 100644
--- a/src/test/groovy/transform/stc/GenericsSTCTest.groovy
+++ b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
@@ -990,7 +990,7 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
         '''
     }
 
-    @NotYetImplemented // GROOVY-10324
+    // GROOVY-10324
     void testDiamondInferrenceFromConstructor18() {
         assertScript '''
             class C<T> {