updating the logic for the test case:testForMethodReferenceInAnAssign…

…ment to modify the caller instead of the method
uber · Oct 13, 2023 · 06d157f · 06d157f
1 parent 0b49a42
commit 06d157f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/nullaway/src/main/java/com/uber/nullaway/GenericsChecks.java b/nullaway/src/main/java/com/uber/nullaway/GenericsChecks.java
@@ -15,7 +15,6 @@
 import com.sun.source.tree.AssignmentTree;
 import com.sun.source.tree.ConditionalExpressionTree;
 import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.MemberReferenceTree;
 import com.sun.source.tree.MemberSelectTree;
 import com.sun.source.tree.MethodInvocationTree;
 import com.sun.source.tree.MethodTree;
@@ -877,13 +876,9 @@ public static Nullness getGenericMethodParameterNullness(
       int parameterIndex,
       Symbol.MethodSymbol method,
       Symbol enclosingSymbol,
-      @Nullable MemberReferenceTree memberReferenceTree,
       VisitorState state,
       Config config) {
-    Type enclosingType =
-        (memberReferenceTree != null)
-            ? ASTHelpers.getType(memberReferenceTree)
-            : getTypeForSymbol(enclosingSymbol, state);
+    Type enclosingType = getTypeForSymbol(enclosingSymbol, state);
     if (enclosingType == null) {
       // we have no additional information from generics, so return NONNULL (presence of a @Nullable
       // annotation should have been handled by the caller)
@@ -894,8 +889,8 @@ public static Nullness getGenericMethodParameterNullness(
 
   /**
    * Just like {@link #getGenericMethodParameterNullness(int, Symbol.MethodSymbol, Symbol,
-   * MemberReferenceTree, VisitorState, Config)}, but takes the enclosing {@code Type} rather than
-   * the enclosing {@code Symbol}.
+   * VisitorState, Config)}, but takes the enclosing {@code Type} rather than the enclosing {@code
+   * Symbol}.
    *
    * @param parameterIndex index of the parameter
    * @param method the generic method

diff --git a/nullaway/src/main/java/com/uber/nullaway/NullAway.java b/nullaway/src/main/java/com/uber/nullaway/NullAway.java
@@ -201,6 +201,7 @@ private enum NullMarking {
      * class has a mix of annotatedness, depending on presence of {@link
      * org.jspecify.annotations.NullMarked} annotations
      */
+    @SuppressWarnings("JavadocReference")
     PARTIALLY_MARKED
   }
 
@@ -735,13 +736,19 @@ private Description checkParamOverriding(
             Nullness.paramHasNullableAnnotation(overriddenMethod, i, config)
                 ? Nullness.NULLABLE
                 : (config.isJSpecifyMode()
-                    ? GenericsChecks.getGenericMethodParameterNullness(
-                        i,
-                        overriddenMethod,
-                        overridingParamSymbols.get(i).owner.owner,
-                        memberReferenceTree,
-                        state,
-                        config)
+                    ? (memberReferenceTree != null)
+                        ? GenericsChecks.getGenericMethodParameterNullness(
+                            i,
+                            overriddenMethod,
+                            ASTHelpers.getType(memberReferenceTree),
+                            state,
+                            config)
+                        : GenericsChecks.getGenericMethodParameterNullness(
+                            i,
+                            overriddenMethod,
+                            overridingParamSymbols.get(i).owner.owner,
+                            state,
+                            config)
                     : Nullness.NONNULL);
       }
     }