Rust: Handle early returns in `async` blocks in CFG #18024

hvitved · 2024-11-19T09:34:19Z

Fixes CFG deadEnd inconsistencies.

Also made the test comply with `cargo check`.

rust/ql/test/library-tests/controlflow-unstable/test.rs

+
+mod if_expression {
+
+    fn test_and_if_let(a: bool, b: Option<bool>, c: bool) -> bool {


rust/ql/test/library-tests/controlflow-unstable/test.rs

+mod if_expression {
+
+    fn test_and_if_let(a: bool, b: Option<bool>, c: bool) -> bool {
+        if a && let Some(d) = b {


rust/ql/test/library-tests/controlflow-unstable/test.rs

+    }
+
+    fn test_and_if_let2(a: bool, b: i64, c: bool) -> bool {
+        if a && let d = b


paldepind

Change looks good to me.

DCA report shows that the recently introduced inconsistencies have been fixed.

hvitved added 2 commits November 19, 2024 10:32

Rust: Add CFG test for early return in async block

b6103e1

Also made the test comply with `cargo check`.

Rust: Handle early returns in async blocks in CFG

bb8d0b4

github-actions bot added the Rust Pull requests that update Rust code label Nov 19, 2024

github-advanced-security bot found potential problems Nov 19, 2024

View reviewed changes

hvitved marked this pull request as ready for review November 19, 2024 09:50

hvitved requested a review from paldepind November 19, 2024 13:25

paldepind approved these changes Nov 19, 2024

View reviewed changes

hvitved merged commit 7a06574 into github:main Nov 19, 2024
15 checks passed

hvitved deleted the rust/cfg/async-block-return branch November 19, 2024 14:21

Provide feedback


		mod if_expression {

		fn test_and_if_let(a: bool, b: Option<bool>, c: bool) -> bool {