Build NullAway with JSpecify mode enabled

uber · Oct 6, 2023 · ca23496 · ca23496
1 parent 613f98c
commit ca23496
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/nullaway/build.gradle b/nullaway/build.gradle
@@ -168,6 +168,7 @@ tasks.register('buildWithNullAway', JavaCompile) {
         option("NullAway:CheckOptionalEmptiness")
         option("NullAway:AcknowledgeRestrictiveAnnotations")
         option("NullAway:CheckContracts")
+        option("NullAway:JSpecifyMode")
     }
     // Make sure the jar has already been built
     dependsOn 'jar'

diff --git a/nullaway/src/main/java/com/uber/nullaway/GenericsChecks.java b/nullaway/src/main/java/com/uber/nullaway/GenericsChecks.java
@@ -36,6 +36,7 @@
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
+import javax.lang.model.type.ExecutableType;
 
 /** Methods for performing checks related to generic types and nullability. */
 public final class GenericsChecks {
@@ -737,8 +738,9 @@ private static Type getTypeForSymbol(Symbol symbol, VisitorState state) {
   private static Nullness getGenericMethodReturnTypeNullness(
       Symbol.MethodSymbol method, Type enclosingType, VisitorState state, Config config) {
     Type overriddenMethodType = state.getTypes().memberType(enclosingType, method);
-    if (!(overriddenMethodType instanceof Type.MethodType)) {
-      throw new RuntimeException("expected method type but instead got " + overriddenMethodType);
+    if (!(overriddenMethodType instanceof ExecutableType)) {
+      throw new RuntimeException(
+          "expected ExecutableType but instead got " + overriddenMethodType.getClass());
     }
     return getTypeNullness(overriddenMethodType.getReturnType(), config);
   }