GROOVY-10846

Author: eric-milles

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);
+    }
 }

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
         }
     }
 

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
         }
     }
 

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
         }
     }