Kotlin: Fix bug in, and performance of, NullGuards::clearlyNotNullExpr

igfoo · igfoo · commit 8d754f5129a7 · 2022-05-10T19:51:15.000+01:00
diff --git a/java/ql/lib/semmle/code/java/dataflow/NullGuards.qll b/java/ql/lib/semmle/code/java/dataflow/NullGuards.qll
@@ -64,9 +64,9 @@ Expr clearlyNotNullExpr(Expr reason) {
   or
   result.(ImplicitCastExpr).getExpr() = clearlyNotNullExpr(reason)
   or
-  result instanceof ImplicitNotNullExpr
+  result instanceof ImplicitNotNullExpr and reason = result
   or
-  result instanceof ImplicitCoercionToUnitExpr
+  result instanceof ImplicitCoercionToUnitExpr and reason = result
   or
   result.(AssignExpr).getSource() = clearlyNotNullExpr(reason)
   or
