fixes for legacy mode

uber · Sep 3, 2024 · e13dc58 · e13dc58
1 parent 4f07f82
commit e13dc58
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/nullaway/src/main/java/com/uber/nullaway/NullAway.java b/nullaway/src/main/java/com/uber/nullaway/NullAway.java
@@ -1788,10 +1788,16 @@ private Description handleInvocation(
             && actualParams.size() == argPos + 1) {
           // This is the case where an array is explicitly passed in the position of the var args
           // parameter
-          // If varargs array itself is not @Nullable, cannot pass @Nullable array
-          if (isMethodAnnotated
-              && !Nullness.varargsArrayIsNullable(formalParams.get(argPos), config)) {
-            mayActualBeNull = mayBeNullExpr(state, actual);
+          // Only check for a nullable varargs array if the method is annotated or a @NonNull
+          // restrictive annotation is present in legacy mode (as previously the annotation was
+          // applied to both the array itself and the elements)
+          boolean checkForNullableVarargsArray =
+              isMethodAnnotated || (config.isLegacyAnnotationLocation() && argIsNonNull);
+          if (checkForNullableVarargsArray) {
+            // If varargs array itself is not @Nullable, cannot pass @Nullable array
+            if (!Nullness.varargsArrayIsNullable(formalParams.get(argPos), config)) {
+              mayActualBeNull = mayBeNullExpr(state, actual);
+            }
           }
         } else {
           // This is the case were varargs are being passed individually, as 1 or more actual

diff --git a/nullaway/src/test/java/com/uber/nullaway/LegacyVarargsTests.java b/nullaway/src/test/java/com/uber/nullaway/LegacyVarargsTests.java
@@ -481,15 +481,15 @@ public void testVarargsRestrictive() {
             "    Object[] y = null;",
             "    // BUG: Diagnostic contains: passing @Nullable parameter 'x'",
             "    Unannotated.takesVarargsDeclaration(x);",
+            "    // BUG: Diagnostic contains: passing @Nullable parameter 'y'",
             "    Unannotated.takesVarargsDeclaration(y);",
             "  }",
             "  public void testTypeUseOnArray() {",
             "    Object x = null;",
             "    Object[] y = null;",
             "    // BUG: Diagnostic contains: passing @Nullable parameter 'x'",
             "    Unannotated.takesVarargsTypeUseOnArray(x);",
-            // TODO report an error here; will require some refactoring of restrictive annotation
-            //  handling
+            "    // BUG: Diagnostic contains: passing @Nullable parameter 'y'",
             "    Unannotated.takesVarargsTypeUseOnArray(y);",
             "  }",
             "}")