Merge pull request #18007 from hvitved/rust/cfg/and-let

Rust: Improve CFG for `let` expressions
github · Nov 19, 2024 · ef9f383 · ef9f383
2 parents 2bfd732 + 46b4bad
commit ef9f383
Show file tree

Hide file tree

Showing 3 changed files with 789 additions and 701 deletions.
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
@@ -71,7 +71,13 @@ module ConditionalCompletionSplitting {
       child = parent.(LogicalNotExpr).getExpr() and
       childCompletion.getDual() = parentCompletion
       or
-      childCompletion = parentCompletion and
+      (
+        childCompletion = parentCompletion
+        or
+        // needed for `let` expressions
+        childCompletion.(MatchCompletion).getValue() =
+          parentCompletion.(BooleanCompletion).getValue()
+      ) and
       (
         child = parent.(BinaryLogicalOperation).getAnOperand()
         or