Fix off-by-one error in JSpecify checking of parameter passing (#793)

Not sure how we missed this before...
uber · Jul 31, 2023 · e711887 · e711887
1 parent 8e4a36a
commit e711887
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/nullaway/src/main/java/com/uber/nullaway/GenericsChecks.java b/nullaway/src/main/java/com/uber/nullaway/GenericsChecks.java
@@ -478,7 +478,7 @@ public void compareGenericTypeParameterNullabilityForCall(
       // all remaining actual arguments in the next loop.
       n = n - 1;
     }
-    for (int i = 0; i < n - 1; i++) {
+    for (int i = 0; i < n; i++) {
       Type formalParameter = formalParams.get(i).type;
       if (!formalParameter.getTypeArguments().isEmpty()) {
         Type actualParameter = getTreeType(actualParams.get(i));

diff --git a/nullaway/src/test/java/com/uber/nullaway/NullAwayJSpecifyGenericsTests.java b/nullaway/src/test/java/com/uber/nullaway/NullAwayJSpecifyGenericsTests.java
@@ -45,6 +45,7 @@ public void constructorTypeParamInstantiation() {
             "    // BUG: Diagnostic contains: Generic type parameter",
             "    testBadNonNull(new NonNullTypeParam<@Nullable String>());",
             "    testBadNonNull(",
+            "        // BUG: Diagnostic contains: Cannot pass parameter of type NonNullTypeParam<@Nullable String>",
             "        new NonNullTypeParam<",
             "            // BUG: Diagnostic contains: Generic type parameter",
             "            @Nullable String>());",
@@ -677,6 +678,8 @@ public void parameterPassing() {
             "  static A<String> sampleMethod2(A<A<@Nullable String>> a1, A<String> a2) {",
             "     return a2;",
             "  }",
+            "  static void sampleMethod3(A<@Nullable String> a1) {",
+            "  }",
             "  static void testPositive1(A<A<@Nullable String>> a1, A<String> a2) {",
             "    // BUG: Diagnostic contains: Cannot pass parameter of type A<A<@Nullable String>>",
             "    A<String> a = sampleMethod1(a1, a2);",
@@ -685,6 +688,10 @@ public void parameterPassing() {
             "    // BUG: Diagnostic contains: Cannot pass parameter of type",
             "    A<String> a = sampleMethod2(a1, a2);",
             "  }",
+            "  static void testPositive3(A<String> a1) {",
+            "    // BUG: Diagnostic contains: Cannot pass parameter of type",
+            "    sampleMethod3(a1);",
+            "  }",
             "  static void testNegative(A<A<String>> a1, A<String> a2) {",
             "    A<String> a = sampleMethod1(a1, a2);",
             "  }",