From ad7d15b15395ca33088b8c0728a5bfc7de544d4e Mon Sep 17 00:00:00 2001
From: Manu Sridharan <msridhar@gmail.com>
Date: Tue, 18 Jul 2023 12:47:47 -0700
Subject: [PATCH] Revert "NULL_LITERAL expressions may always be null (#749)"

This reverts commit e4dfeac65e43cf5f3f4345815b23e5678d9f4fdd.
---
 nullaway/src/main/java/com/uber/nullaway/NullAway.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nullaway/src/main/java/com/uber/nullaway/NullAway.java b/nullaway/src/main/java/com/uber/nullaway/NullAway.java
index 51f63fcd29..62d49d2a23 100644
--- a/nullaway/src/main/java/com/uber/nullaway/NullAway.java
+++ b/nullaway/src/main/java/com/uber/nullaway/NullAway.java
@@ -2197,14 +2197,14 @@ private boolean mayBeNullExpr(VisitorState state, ExpressionTree expr) {
       // obviously not null
       return false;
     }
-    if (expr.getKind() == Tree.Kind.NULL_LITERAL) {
-      // obviously null, so same as for above literals we return early without consulting handlers
-      return true;
-    }
     // the logic here is to avoid doing dataflow analysis whenever possible
     Symbol exprSymbol = ASTHelpers.getSymbol(expr);
     boolean exprMayBeNull;
     switch (expr.getKind()) {
+      case NULL_LITERAL:
+        // obviously null
+        exprMayBeNull = true;
+        break;
       case ARRAY_ACCESS:
         // unsound!  we cannot check for nullness of array contents yet
         exprMayBeNull = false;