Merge pull request #2584 from aschackmull/java/nonnull-final-field

Java: Include non-null final fields in clearlyNotNull.

java/ql/src/semmle/code/java/dataflow/NullGuards.qll

@@ -101,6 +101,12 @@ predicate clearlyNotNull(SsaVariable v, Expr reason) {
     v.(SsaImplicitInit).captures(captured) and
     clearlyNotNull(captured, reason)
   )
+  or
+  exists(Field f |
+    v.getSourceVariable().getVariable() = f and
+    f.isFinal() and
+    f.getInitializer() = clearlyNotNullExpr(reason)
+  )
 }
 
 /** Gets an expression that is provably not `null`. */