Make arg position nullness array contents nullable (#1207)

msridhar · web-flow · commit 1f1b386b9e60 · 2025-04-28T17:51:11.000-04:00
Fixes #1206
diff --git a/nullaway/src/main/java/com/uber/nullaway/NullAway.java b/nullaway/src/main/java/com/uber/nullaway/NullAway.java
@@ -793,7 +793,7 @@ private Description checkParamOverriding(
 
     // Get argument nullability for the overridden method.  If overriddenMethodArgNullnessMap[i] is
     // null, parameter i is treated as unannotated.
-    Nullness[] overriddenMethodArgNullnessMap = new Nullness[superParamSymbols.size()];
+    @Nullable Nullness[] overriddenMethodArgNullnessMap = new Nullness[superParamSymbols.size()];
 
     // Collect @Nullable params of overridden method iff the overridden method is in annotated code
     // (otherwise, whether we acknowledge @Nullable in unannotated code or not depends on the
@@ -1878,7 +1878,7 @@ private Description handleInvocation(
     boolean isMethodAnnotated =
         !codeAnnotationInfo.isSymbolUnannotated(methodSymbol, config, handler);
     // If argumentPositionNullness[i] == null, parameter i is unannotated
-    Nullness[] argumentPositionNullness = new Nullness[formalParams.size()];
+    @Nullable Nullness[] argumentPositionNullness = new Nullness[formalParams.size()];
 
     if (isMethodAnnotated) {
       // compute which arguments are @NonNull
diff --git a/nullaway/src/main/java/com/uber/nullaway/dataflow/CoreNullnessStoreInitializer.java b/nullaway/src/main/java/com/uber/nullaway/dataflow/CoreNullnessStoreInitializer.java
@@ -110,7 +110,7 @@ private static NullnessStore lambdaInitialStore(
                 types, castToNonNull(ASTHelpers.getType(code)), fiMethodSymbol, config)
             .getParameterTypes();
     // If fiArgumentPositionNullness[i] == null, parameter position i is unannotated
-    Nullness[] fiArgumentPositionNullness = new Nullness[fiMethodParameters.size()];
+    @Nullable Nullness[] fiArgumentPositionNullness = new Nullness[fiMethodParameters.size()];
     boolean isFIAnnotated =
         !codeAnnotationInfo.isSymbolUnannotated(fiMethodSymbol, config, handler);
     if (isFIAnnotated) {
diff --git a/nullaway/src/main/java/com/uber/nullaway/handlers/BaseNoOpHandler.java b/nullaway/src/main/java/com/uber/nullaway/handlers/BaseNoOpHandler.java
@@ -117,11 +117,11 @@ public boolean onOverrideFieldNullability(Symbol field) {
   }
 
   @Override
-  public Nullness[] onOverrideMethodInvocationParametersNullability(
+  public @Nullable Nullness[] onOverrideMethodInvocationParametersNullability(
       Context context,
       Symbol.MethodSymbol methodSymbol,
       boolean isAnnotated,
-      Nullness[] argumentPositionNullness) {
+      @Nullable Nullness[] argumentPositionNullness) {
     // NoOp
     return argumentPositionNullness;
   }
diff --git a/nullaway/src/main/java/com/uber/nullaway/handlers/CompositeHandler.java b/nullaway/src/main/java/com/uber/nullaway/handlers/CompositeHandler.java
@@ -143,11 +143,11 @@ public boolean onOverrideFieldNullability(Symbol field) {
   }
 
   @Override
-  public Nullness[] onOverrideMethodInvocationParametersNullability(
+  public @Nullable Nullness[] onOverrideMethodInvocationParametersNullability(
       Context context,
       Symbol.MethodSymbol methodSymbol,
       boolean isAnnotated,
-      Nullness[] argumentPositionNullness) {
+      @Nullable Nullness[] argumentPositionNullness) {
     for (Handler h : handlers) {
       argumentPositionNullness =
           h.onOverrideMethodInvocationParametersNullability(
diff --git a/nullaway/src/main/java/com/uber/nullaway/handlers/Handler.java b/nullaway/src/main/java/com/uber/nullaway/handlers/Handler.java
@@ -188,11 +188,11 @@ Nullness onOverrideMethodReturnNullability(
    * @return The updated nullness info for each argument position, as computed by the current
    *     handler.
    */
-  Nullness[] onOverrideMethodInvocationParametersNullability(
+  @Nullable Nullness[] onOverrideMethodInvocationParametersNullability(
       Context context,
       Symbol.MethodSymbol methodSymbol,
       boolean isAnnotated,
-      Nullness[] argumentPositionNullness);
+      @Nullable Nullness[] argumentPositionNullness);
 
   /**
    * Called when the Dataflow analysis generates the initial NullnessStore for a method or lambda.
diff --git a/nullaway/src/main/java/com/uber/nullaway/handlers/LibraryModelsHandler.java b/nullaway/src/main/java/com/uber/nullaway/handlers/LibraryModelsHandler.java
@@ -110,11 +110,11 @@ public NullnessHint onDataflowVisitFieldAccess(
   }
 
   @Override
-  public Nullness[] onOverrideMethodInvocationParametersNullability(
+  public @Nullable Nullness[] onOverrideMethodInvocationParametersNullability(
       Context context,
       Symbol.MethodSymbol methodSymbol,
       boolean isAnnotated,
-      Nullness[] argumentPositionNullness) {
+      @Nullable Nullness[] argumentPositionNullness) {
     OptimizedLibraryModels optimizedLibraryModels = getOptLibraryModels(context);
     ImmutableSet<Integer> nullableParamsFromModel =
         optimizedLibraryModels.explicitlyNullableParameters(methodSymbol);
diff --git a/nullaway/src/main/java/com/uber/nullaway/handlers/RestrictiveAnnotationHandler.java b/nullaway/src/main/java/com/uber/nullaway/handlers/RestrictiveAnnotationHandler.java
@@ -104,11 +104,11 @@ private CodeAnnotationInfo getCodeAnnotationInfo(Context context) {
   }
 
   @Override
-  public Nullness[] onOverrideMethodInvocationParametersNullability(
+  public @Nullable Nullness[] onOverrideMethodInvocationParametersNullability(
       Context context,
       Symbol.MethodSymbol methodSymbol,
       boolean isAnnotated,
-      Nullness[] argumentPositionNullness) {
+      @Nullable Nullness[] argumentPositionNullness) {
     if (isAnnotated) {
       // We ignore isAnnotated code here, since annotations in code considered isAnnotated are
       // already handled by NullAway's core algorithm.

Original file line number	Diff line number	Diff line change
`@@ -117,11 +117,11 @@ public boolean onOverrideFieldNullability(Symbol field) {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`@Override`
`120`		`- public Nullness[] onOverrideMethodInvocationParametersNullability(`
	`120`	`+ public @Nullable Nullness[] onOverrideMethodInvocationParametersNullability(`
`121`	`121`	`Context context,`
`122`	`122`	`Symbol.MethodSymbol methodSymbol,`
`123`	`123`	`boolean isAnnotated,`
`124`		`- Nullness[] argumentPositionNullness) {`
	`124`	`+ @Nullable Nullness[] argumentPositionNullness) {`
`125`	`125`	`// NoOp`
`126`	`126`	`return argumentPositionNullness;`
`127`	`127`	`}`