changes related to the test testForLambdasInAnAssignment

uber · Oct 20, 2023 · a72b4a6 · a72b4a6
1 parent 8f270e2
commit a72b4a6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/nullaway/src/main/java/com/uber/nullaway/dataflow/CoreNullnessStoreInitializer.java b/nullaway/src/main/java/com/uber/nullaway/dataflow/CoreNullnessStoreInitializer.java
@@ -3,10 +3,12 @@
 import static com.uber.nullaway.Nullness.NONNULL;
 import static com.uber.nullaway.Nullness.NULLABLE;
 
+import com.google.errorprone.util.ASTHelpers;
 import com.sun.source.tree.ClassTree;
 import com.sun.source.tree.LambdaExpressionTree;
 import com.sun.source.tree.VariableTree;
 import com.sun.tools.javac.code.Symbol;
+import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.Types;
 import com.sun.tools.javac.util.Context;
 import com.uber.nullaway.CodeAnnotationInfo;
@@ -92,13 +94,25 @@ private static NullnessStore lambdaInitialStore(
     Symbol.MethodSymbol fiMethodSymbol = NullabilityUtil.getFunctionalInterfaceMethod(code, types);
     com.sun.tools.javac.util.List<Symbol.VarSymbol> fiMethodParameters =
         fiMethodSymbol.getParameters();
+    // This obtains the Types of the functional interface method with preserved annotations in case
+    // of generic types
+    List<Type> overridenMethodParamTypeList =
+        types.memberType(ASTHelpers.getType(code), fiMethodSymbol).getParameterTypes();
     // If fiArgumentPositionNullness[i] == null, parameter position i is unannotated
     Nullness[] fiArgumentPositionNullness = new Nullness[fiMethodParameters.size()];
     final boolean isFIAnnotated = !codeAnnotationInfo.isSymbolUnannotated(fiMethodSymbol, config);
     if (isFIAnnotated) {
       for (int i = 0; i < fiMethodParameters.size(); i++) {
-        fiArgumentPositionNullness[i] =
-            Nullness.hasNullableAnnotation(fiMethodParameters.get(i), config) ? NULLABLE : NONNULL;
+        if (Nullness.hasNullableAnnotation(fiMethodParameters.get(i), config)) {
+          // Get the Nullness if the Annotation is directly written with the parameter
+          fiArgumentPositionNullness[i] = NULLABLE;
+        } else if (Nullness.hasNullableAnnotation(
+            overridenMethodParamTypeList.get(i).getAnnotationMirrors().stream(), config)) {
+          // Get the Nullness if the Annotation is indirectly applied through a generic type
+          fiArgumentPositionNullness[i] = NULLABLE;
+        } else {
+          fiArgumentPositionNullness[i] = NONNULL;
+        }
       }
     }
     fiArgumentPositionNullness =

diff --git a/nullaway/src/test/java/com/uber/nullaway/NullAwayJSpecifyGenericsTests.java b/nullaway/src/test/java/com/uber/nullaway/NullAwayJSpecifyGenericsTests.java
@@ -596,8 +596,7 @@ public void testForLambdasInAnAssignment() {
             "    String function(T1 o);",
             "  }",
             "  static void testPositive() {",
-            "    // TODO: we should report an error here, since the lambda cannot take",
-            "    // a @Nullable parameter.  we don't catch this yet",
+            "    // BUG: Diagnostic contains: dereferenced expression o is @Nullable",
             "    A<@Nullable Object> p = o -> o.toString();",
             "  }",
             "  static void testNegative() {",