Model Class.isInstance (#732)

also call `getOptLibraryModels` only once
uber · Feb 6, 2023 · de6e014 · de6e014
1 parent de74310
commit de6e014
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/nullaway/src/main/java/com/uber/nullaway/handlers/LibraryModelsHandler.java b/nullaway/src/main/java/com/uber/nullaway/handlers/LibraryModelsHandler.java
@@ -229,14 +229,13 @@ private void setConditionalArgumentNullness(
       Symbol.MethodSymbol callee,
       VisitorState state,
       AccessPath.AccessPathContext apContext) {
-    Set<Integer> nullImpliesTrueParameters =
-        getOptLibraryModels(state.context).nullImpliesTrueParameters(callee);
-    Set<Integer> nullImpliesFalseParameters =
-        getOptLibraryModels(state.context).nullImpliesFalseParameters(callee);
+    OptimizedLibraryModels optLibraryModels = getOptLibraryModels(state.context);
+    Set<Integer> nullImpliesTrueParameters = optLibraryModels.nullImpliesTrueParameters(callee);
     for (AccessPath accessPath :
         accessPathsAtIndexes(nullImpliesTrueParameters, arguments, state, apContext)) {
       elseUpdates.set(accessPath, NONNULL);
     }
+    Set<Integer> nullImpliesFalseParameters = optLibraryModels.nullImpliesFalseParameters(callee);
     for (AccessPath accessPath :
         accessPathsAtIndexes(nullImpliesFalseParameters, arguments, state, apContext)) {
       thenUpdates.set(accessPath, NONNULL);
@@ -580,6 +579,7 @@ private static class DefaultLibraryModels implements LibraryModels {
 
     private static final ImmutableSetMultimap<MethodRef, Integer> NULL_IMPLIES_FALSE_PARAMETERS =
         new ImmutableSetMultimap.Builder<MethodRef, Integer>()
+            .put(methodRef("java.lang.Class", "isInstance(java.lang.Object)"), 0)
             .put(methodRef("java.util.Objects", "nonNull(java.lang.Object)"), 0)
             .put(
                 methodRef("org.springframework.util.StringUtils", "hasLength(java.lang.String)"), 0)

diff --git a/nullaway/src/test/java/com/uber/nullaway/NullAwayFrameworkTests.java b/nullaway/src/test/java/com/uber/nullaway/NullAwayFrameworkTests.java
@@ -97,6 +97,27 @@ public void defaultLibraryModelsObjectNonNull() {
         .doTest();
   }
 
+  @Test
+  public void defaultLibraryModelsClassIsInstance() {
+    defaultCompilationHelper
+        .addSourceLines(
+            "Test.java",
+            "package com.uber;",
+            "import java.util.Objects;",
+            "import javax.annotation.Nullable;",
+            "public class Test {",
+            "  int classIsInstance(@Nullable String s) {",
+            "    if (CharSequence.class.isInstance(s)) {",
+            "      return s.hashCode();",
+            "    } else {",
+            "      // BUG: Diagnostic contains: dereferenced",
+            "      return s.hashCode();",
+            "    }",
+            "  }",
+            "}")
+        .doTest();
+  }
+
   @Test
   public void checkForNullSupport() {
     defaultCompilationHelper