Shared/Java: Make the 'isNull' interface slightly prettier.

Author: MathiasVP

java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll

@@ -133,11 +133,12 @@ private module Input implements TypeFlowInput<J::Location> {
       not decl.hasImplicitInit() and
       not exists(decl.getInit())
     )
-    or
-    forex(TypeFlowNode mid | joinStep(mid, n) | Make<J::Location, Input>::isNull(mid)) and
+  }
+
+  predicate isExcludedFromNullAnalysis(TypeFlowNode n) {
     // Fields that are never assigned a non-null value are probably set by
     // reflection and are thus not always null.
-    not exists(n.asField())
+    exists(n.asField())
   }
 
   predicate exactTypeBase(TypeFlowNode n, RefType t) {

shared/typeflow/codeql/typeflow/TypeFlow.qll

@@ -42,6 +42,12 @@ signature module TypeFlowInput<LocationSig Location> {
   /** Holds if `n` represents a `null` value. */
   predicate isNullValue(TypeFlowNode n);
 
+  /**
+   * Holds if `n` should be excluded from the set of null values even if
+   * the null analysis determines that `n` is always null.
+   */
+  default predicate isExcludedFromNullAnalysis(TypeFlowNode n) { none() }
+
   /** A type. */
   class Type {
     /** Gets a textual representation of this type. */

shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll

@@ -10,6 +10,9 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
     isNullValue(n)
     or
     exists(TypeFlowNode mid | isNull(mid) and step(mid, n))
+    or
+    forex(TypeFlowNode mid | I::joinStep(mid, n) | isNull(mid)) and
+    not isExcludedFromNullAnalysis(n)
   }
 
   /**