From 1c73d43b4f20ffc0241bda55d437614f9903e12b Mon Sep 17 00:00:00 2001 From: Mathias Vorreiter Pedersen Date: Fri, 8 Dec 2023 09:29:48 +0000 Subject: [PATCH] C++: Accept more test changes. --- .../ArrayAccessProductFlow.expected | 18 +++++++++--------- .../dataflow-ir-consistency.expected | 18 ------------------ 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-193/array-access/ArrayAccessProductFlow.expected b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-193/array-access/ArrayAccessProductFlow.expected index c46629218fd..301d9e153f8 100644 --- a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-193/array-access/ArrayAccessProductFlow.expected +++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-193/array-access/ArrayAccessProductFlow.expected @@ -3,8 +3,8 @@ edges | test.cpp:4:17:4:22 | call to malloc | test.cpp:10:9:10:11 | arr | | test.cpp:19:9:19:16 | mk_array indirection [p] | test.cpp:28:19:28:26 | call to mk_array [p] | | test.cpp:19:9:19:16 | mk_array indirection [p] | test.cpp:50:18:50:25 | call to mk_array [p] | -| test.cpp:21:5:21:24 | ... = ... | test.cpp:21:9:21:9 | arr indirection [post update] [p] | -| test.cpp:21:9:21:9 | arr indirection [post update] [p] | test.cpp:22:5:22:7 | arr indirection [p] | +| test.cpp:21:5:21:7 | arr indirection [post update] [p] | test.cpp:22:5:22:7 | arr indirection [p] | +| test.cpp:21:5:21:24 | ... = ... | test.cpp:21:5:21:7 | arr indirection [post update] [p] | | test.cpp:21:13:21:18 | call to malloc | test.cpp:21:5:21:24 | ... = ... | | test.cpp:22:5:22:7 | arr indirection [p] | test.cpp:19:9:19:16 | mk_array indirection [p] | | test.cpp:28:19:28:26 | call to mk_array [p] | test.cpp:31:9:31:11 | arr indirection [p] | @@ -16,8 +16,8 @@ edges | test.cpp:41:9:41:11 | arr indirection [p] | test.cpp:41:13:41:13 | p | | test.cpp:45:9:45:11 | arr indirection [p] | test.cpp:45:13:45:13 | p | | test.cpp:50:18:50:25 | call to mk_array [p] | test.cpp:39:27:39:29 | arr [p] | -| test.cpp:55:5:55:24 | ... = ... | test.cpp:55:9:55:9 | arr indirection [post update] [p] | -| test.cpp:55:9:55:9 | arr indirection [post update] [p] | test.cpp:56:5:56:7 | arr indirection [p] | +| test.cpp:55:5:55:7 | arr indirection [post update] [p] | test.cpp:56:5:56:7 | arr indirection [p] | +| test.cpp:55:5:55:24 | ... = ... | test.cpp:55:5:55:7 | arr indirection [post update] [p] | | test.cpp:55:13:55:18 | call to malloc | test.cpp:55:5:55:24 | ... = ... | | test.cpp:56:5:56:7 | arr indirection [p] | test.cpp:59:9:59:11 | arr indirection [p] | | test.cpp:56:5:56:7 | arr indirection [p] | test.cpp:63:9:63:11 | arr indirection [p] | @@ -25,8 +25,8 @@ edges | test.cpp:63:9:63:11 | arr indirection [p] | test.cpp:63:13:63:13 | p | | test.cpp:67:10:67:19 | mk_array_p indirection [p] | test.cpp:76:20:76:29 | call to mk_array_p indirection [p] | | test.cpp:67:10:67:19 | mk_array_p indirection [p] | test.cpp:98:18:98:27 | call to mk_array_p indirection [p] | -| test.cpp:69:5:69:25 | ... = ... | test.cpp:69:10:69:10 | arr indirection [post update] [p] | -| test.cpp:69:10:69:10 | arr indirection [post update] [p] | test.cpp:70:5:70:7 | arr indirection [p] | +| test.cpp:69:5:69:7 | arr indirection [post update] [p] | test.cpp:70:5:70:7 | arr indirection [p] | +| test.cpp:69:5:69:25 | ... = ... | test.cpp:69:5:69:7 | arr indirection [post update] [p] | | test.cpp:69:14:69:19 | call to malloc | test.cpp:69:5:69:25 | ... = ... | | test.cpp:70:5:70:7 | arr indirection [p] | test.cpp:67:10:67:19 | mk_array_p indirection [p] | | test.cpp:76:20:76:29 | call to mk_array_p indirection [p] | test.cpp:79:9:79:11 | arr indirection [p] | @@ -43,8 +43,8 @@ nodes | test.cpp:6:9:6:11 | arr | semmle.label | arr | | test.cpp:10:9:10:11 | arr | semmle.label | arr | | test.cpp:19:9:19:16 | mk_array indirection [p] | semmle.label | mk_array indirection [p] | +| test.cpp:21:5:21:7 | arr indirection [post update] [p] | semmle.label | arr indirection [post update] [p] | | test.cpp:21:5:21:24 | ... = ... | semmle.label | ... = ... | -| test.cpp:21:9:21:9 | arr indirection [post update] [p] | semmle.label | arr indirection [post update] [p] | | test.cpp:21:13:21:18 | call to malloc | semmle.label | call to malloc | | test.cpp:22:5:22:7 | arr indirection [p] | semmle.label | arr indirection [p] | | test.cpp:28:19:28:26 | call to mk_array [p] | semmle.label | call to mk_array [p] | @@ -58,8 +58,8 @@ nodes | test.cpp:45:9:45:11 | arr indirection [p] | semmle.label | arr indirection [p] | | test.cpp:45:13:45:13 | p | semmle.label | p | | test.cpp:50:18:50:25 | call to mk_array [p] | semmle.label | call to mk_array [p] | +| test.cpp:55:5:55:7 | arr indirection [post update] [p] | semmle.label | arr indirection [post update] [p] | | test.cpp:55:5:55:24 | ... = ... | semmle.label | ... = ... | -| test.cpp:55:9:55:9 | arr indirection [post update] [p] | semmle.label | arr indirection [post update] [p] | | test.cpp:55:13:55:18 | call to malloc | semmle.label | call to malloc | | test.cpp:56:5:56:7 | arr indirection [p] | semmle.label | arr indirection [p] | | test.cpp:59:9:59:11 | arr indirection [p] | semmle.label | arr indirection [p] | @@ -67,8 +67,8 @@ nodes | test.cpp:63:9:63:11 | arr indirection [p] | semmle.label | arr indirection [p] | | test.cpp:63:13:63:13 | p | semmle.label | p | | test.cpp:67:10:67:19 | mk_array_p indirection [p] | semmle.label | mk_array_p indirection [p] | +| test.cpp:69:5:69:7 | arr indirection [post update] [p] | semmle.label | arr indirection [post update] [p] | | test.cpp:69:5:69:25 | ... = ... | semmle.label | ... = ... | -| test.cpp:69:10:69:10 | arr indirection [post update] [p] | semmle.label | arr indirection [post update] [p] | | test.cpp:69:14:69:19 | call to malloc | semmle.label | call to malloc | | test.cpp:70:5:70:7 | arr indirection [p] | semmle.label | arr indirection [p] | | test.cpp:76:20:76:29 | call to mk_array_p indirection [p] | semmle.label | call to mk_array_p indirection [p] | diff --git a/cpp/ql/test/library-tests/syntax-zoo/dataflow-ir-consistency.expected b/cpp/ql/test/library-tests/syntax-zoo/dataflow-ir-consistency.expected index 4bb6a9e2736..75849c0d8bf 100644 --- a/cpp/ql/test/library-tests/syntax-zoo/dataflow-ir-consistency.expected +++ b/cpp/ql/test/library-tests/syntax-zoo/dataflow-ir-consistency.expected @@ -20,24 +20,6 @@ localCallNodes postIsNotPre postHasUniquePre uniquePostUpdate -| allocators.cpp:4:24:4:26 | this indirection | Node has multiple PostUpdateNodes. | -| cpp11.cpp:82:17:82:17 | this indirection | Node has multiple PostUpdateNodes. | -| cpp11.cpp:82:17:82:55 | [...](...){...} indirection | Node has multiple PostUpdateNodes. | -| ir.cpp:514:10:514:11 | definition of r2 indirection | Node has multiple PostUpdateNodes. | -| ir.cpp:515:10:515:11 | definition of r3 indirection | Node has multiple PostUpdateNodes. | -| ir.cpp:515:10:515:11 | definition of r3 indirection | Node has multiple PostUpdateNodes. | -| ir.cpp:516:10:516:11 | definition of r4 indirection | Node has multiple PostUpdateNodes. | -| ir.cpp:516:10:516:11 | definition of r4 indirection | Node has multiple PostUpdateNodes. | -| ir.cpp:659:5:659:5 | this indirection | Node has multiple PostUpdateNodes. | -| ir.cpp:659:5:659:5 | this indirection | Node has multiple PostUpdateNodes. | -| ir.cpp:747:8:747:8 | this indirection | Node has multiple PostUpdateNodes. | -| ir.cpp:750:3:750:6 | this indirection | Node has multiple PostUpdateNodes. | -| ir.cpp:759:3:759:8 | this indirection | Node has multiple PostUpdateNodes. | -| ir.cpp:768:3:768:9 | this indirection | Node has multiple PostUpdateNodes. | -| ir.cpp:777:3:777:11 | this indirection | Node has multiple PostUpdateNodes. | -| ir.cpp:786:3:786:11 | this indirection | Node has multiple PostUpdateNodes. | -| ir.cpp:795:3:795:11 | this indirection | Node has multiple PostUpdateNodes. | -| static_init_templates.cpp:240:7:240:7 | this indirection | Node has multiple PostUpdateNodes. | postIsInSameCallable reverseRead argHasPostUpdate