more

msridhar · msridhar · commit 541883bc24d3 · 2025-11-03T16:44:14.000-08:00
diff --git a/nullaway/src/main/java/com/uber/nullaway/NullAway.java b/nullaway/src/main/java/com/uber/nullaway/NullAway.java
@@ -22,6 +22,7 @@
 
 package com.uber.nullaway;
 
+import static com.google.common.base.Verify.verify;
 import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
 import static com.sun.source.tree.Tree.Kind.OTHER;
 import static com.uber.nullaway.ASTHelpersBackports.hasDirectAnnotationWithSimpleName;
@@ -35,7 +36,6 @@
 
 import com.google.auto.service.AutoService;
 import com.google.auto.value.AutoValue;
-import com.google.common.base.Verify;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
@@ -446,7 +446,7 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState
 
   private static Symbol.MethodSymbol getSymbolForMethodInvocation(MethodInvocationTree tree) {
     Symbol.MethodSymbol methodSymbol = ASTHelpers.getSymbol(tree);
-    Verify.verify(methodSymbol != null, "not expecting unresolved method here");
+    verify(methodSymbol != null, "not expecting unresolved method here");
     // In certain cases, we need to get the base symbol for the method rather than the symbol
     // attached to the call.
     // For interface methods, if the method is an implicit method corresponding to a method from
@@ -2723,11 +2723,20 @@ private boolean mayBeNullMethodCall(
     // NOTE: we cannot rely on state.getPath() here to get a TreePath to the invocation, since
     // sometimes the invocation is a sub-node of the leaf of the path.  So, here if inference runs,
     // it will do so without an assignment context.  If this becomes a problem, we can revisit
-    if (config.isJSpecifyMode()
-        && genericsChecks
-            .getGenericReturnNullnessAtInvocation(exprSymbol, invocationTree, null, state, false)
-            .equals(Nullness.NULLABLE)) {
-      return true;
+    if (config.isJSpecifyMode() && exprSymbol.getReturnType().getKind().equals(TypeKind.TYPEVAR)) {
+      TreePath path = state.getPath();
+      var invocationPath = TreePath.getPath(path, invocationTree);
+      verify(
+          invocationPath != null,
+          "%s not found as a descendant of %s",
+          invocationTree,
+          path.getLeaf());
+      if (genericsChecks
+          .getGenericReturnNullnessAtInvocation(
+              exprSymbol, invocationTree, invocationPath, state, false)
+          .equals(Nullness.NULLABLE)) {
+        return true;
+      }
     }
     return false;
   }
diff --git a/nullaway/src/test/java/com/uber/nullaway/jspecify/GenericMethodTests.java b/nullaway/src/test/java/com/uber/nullaway/jspecify/GenericMethodTests.java
@@ -1299,7 +1299,7 @@ public void inferenceFromDataflow() {
             "    // to ensure that dataflow runs",
             "    Object x = new Object(); x.toString();",
             "    Object y = null;",
-            "    // BUG: Diagnostic contains: returning @Nullable expression from method with @NonNull return type",
+            "    // BUG: Diagnostic contains: passing @Nullable parameter 'y' where @NonNull is required",
             "    return (((id(y))));",
             "  }",
             "  static Object testReturnNested() {",
