GROOVY-9984

groovy · Mar 23, 2021 · 35b49a1 · 35b49a1
1 parent fcbfaab
commit 35b49a1
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/...ovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java b/...ovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java
@@ -1315,6 +1315,27 @@ public void testTypeChecked9977() {
         runConformTest(sources, "-1");
     }
 
+    @Test
+    public void testTypeChecked9984() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.TupleConstructor(defaults=false)\n" +
+            "class C<T> {\n" +
+            "  T p\n" +
+            "}\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "void test() {\n" +
+            "  C<Integer> c = new C<>(null)\n" +
+            "  print c.p\n" +
+            "}\n" +
+            "test()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "null");
+    }
+
     @Test
     public void testTypeChecked9991() {
         if (Float.parseFloat(System.getProperty("java.specification.version")) > 8)

diff --git a/...rg.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -5675,6 +5675,9 @@ protected ClassNode inferReturnTypeGenerics(
         int paramLength = parameters.length;
         if (expressions.size() >= paramLength) {
             for (int i = 0; i < paramLength; i += 1) {
+                // GRECLIPSE add -- GROOVY-9984: skip null
+                if (isNullConstant(expressions.get(i))) continue;
+                // GRECLIPSE end
                 boolean lastArg = (i == paramLength - 1);
                 ClassNode type = parameters[i].getType();
                 /* GRECLIPSE edit -- GROOVY-9996

diff --git a/...rg.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -5437,6 +5437,9 @@ protected ClassNode inferReturnTypeGenerics(final ClassNode receiver, final Meth
         int paramLength = parameters.length;
         if (expressions.size() >= paramLength) {
             for (int i = 0; i < paramLength; i += 1) {
+                // GRECLIPSE add -- GROOVY-9984: skip null
+                if (isNullConstant(expressions.get(i))) continue;
+                // GRECLIPSE end
                 boolean lastArg = (i == paramLength - 1);
                 ClassNode paramType = parameters[i].getType();
                 /* GRECLIPSE edit -- GROOVY-9996

diff --git a/...rg.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -5403,6 +5403,9 @@ protected ClassNode inferReturnTypeGenerics(final ClassNode receiver, final Meth
         int paramLength = parameters.length;
         if (expressions.size() >= paramLength) {
             for (int i = 0; i < paramLength; i += 1) {
+                // GRECLIPSE add -- GROOVY-9984: skip null
+                if (isNullConstant(expressions.get(i))) continue;
+                // GRECLIPSE end
                 boolean lastArg = (i == paramLength - 1);
                 ClassNode paramType = parameters[i].getType();
                 /* GRECLIPSE edit -- GROOVY-9996