GROOVY-10846

eric-milles · eric-milles · commit d6219e835e4d · 2022-11-18T15:49:38.000-06:00
diff --git a/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java b/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java
@@ -6656,4 +6656,25 @@ public void testTypeChecked10787() {
 
         runConformTest(sources);
     }
+
+    @Test
+    public void testTypeChecked10846() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "class A { public String b }\n" +
+            "class C<X extends A, Y extends List<X>> {\n" +
+            "  @groovy.transform.TypeChecked\n" +
+            "  void test(X x) {\n" +
+            "    x.b = 'works'\n" +
+            "    print x.b\n" +
+            "  }\n" +
+            "}\n" +
+            "A a = []\n" +
+            "new C<A, List<A>>().test(a)\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources);
+    }
 }
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -4385,7 +4385,8 @@ private static void addBoundType(final ClassNode receiver, final List<Receiver<S
                 addSelfTypes(cn, owners);
             }
         } else {
-            owners.add(Receiver.<String>make(OBJECT_TYPE)); // T or T super Type
+            ClassNode cn = gt.getType().redirect(); // GROOVY-10846
+            owners.add(Receiver.make(cn)); // T or T super Type
         }
     }
 
diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -4214,7 +4214,8 @@ private static void addBoundType(final ClassNode receiver, final List<Receiver<S
                 addSelfTypes(cn, owners);
             }
         } else {
-            owners.add(Receiver.make(OBJECT_TYPE)); // T or T super Type
+            ClassNode cn = gt.getType().redirect(); // GROOVY-10846
+            owners.add(Receiver.make(cn)); // T or T super Type
         }
     }
 
diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -3893,7 +3893,8 @@ private static void addBoundType(final ClassNode receiver, final List<Receiver<S
                 addSelfTypes(cn, owners);
             }
         } else {
-            owners.add(Receiver.make(OBJECT_TYPE)); // T or T super Type
+            ClassNode cn = gt.getType().redirect(); // GROOVY-10846
+            owners.add(Receiver.make(cn)); // T or T super Type
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -4385,7 +4385,8 @@ private static void addBoundType(final ClassNode receiver, final List<Receiver<S`
`4385`	`4385`	`addSelfTypes(cn, owners);`
`4386`	`4386`	`}`
`4387`	`4387`	`} else {`
`4388`		`- owners.add(Receiver.<String>make(OBJECT_TYPE)); // T or T super Type`
	`4388`	`+ ClassNode cn = gt.getType().redirect(); // GROOVY-10846`
	`4389`	`+ owners.add(Receiver.make(cn)); // T or T super Type`
`4389`	`4390`	`}`
`4390`	`4391`	`}`
`4391`	`4392`
Original file line number	Diff line number	Diff line change
`@@ -4214,7 +4214,8 @@ private static void addBoundType(final ClassNode receiver, final List<Receiver<S`
`4214`	`4214`	`addSelfTypes(cn, owners);`
`4215`	`4215`	`}`
`4216`	`4216`	`} else {`
`4217`		`- owners.add(Receiver.make(OBJECT_TYPE)); // T or T super Type`
	`4217`	`+ ClassNode cn = gt.getType().redirect(); // GROOVY-10846`
	`4218`	`+ owners.add(Receiver.make(cn)); // T or T super Type`
`4218`	`4219`	`}`
`4219`	`4220`	`}`
`4220`	`4221`
Original file line number	Diff line number	Diff line change
`@@ -3893,7 +3893,8 @@ private static void addBoundType(final ClassNode receiver, final List<Receiver<S`
`3893`	`3893`	`addSelfTypes(cn, owners);`
`3894`	`3894`	`}`
`3895`	`3895`	`} else {`
`3896`		`- owners.add(Receiver.make(OBJECT_TYPE)); // T or T super Type`
	`3896`	`+ ClassNode cn = gt.getType().redirect(); // GROOVY-10846`
	`3897`	`+ owners.add(Receiver.make(cn)); // T or T super Type`
`3897`	`3898`	`}`
`3898`	`3899`	`}`
`3899`	`3900`