C++: Add more tests.

2025-12-17 01:03:14 +01:00 · 2025-01-16 17:14:13 +00:00
parent d0bd6eb2eb
commit d5b31eb98c
6 changed files with 272 additions and 0 deletions
--- a/cpp/ql/test/library-tests/controlflow/guards/Guards.expected
+++ b/cpp/ql/test/library-tests/controlflow/guards/Guards.expected
@@ -38,6 +38,12 @@
 | test.c:182:10:182:20 | ... >= ... |
 | test.c:182:10:182:33 | ... && ... |
 | test.c:182:25:182:33 | ... < ... |
+| test.c:190:7:190:8 | ! ... |
+| test.c:190:8:190:8 | c |
+| test.c:198:7:198:8 | ! ... |
+| test.c:198:8:198:8 | b |
+| test.c:206:7:206:8 | ! ... |
+| test.c:206:8:206:8 | c |
 | test.cpp:18:8:18:10 | call to get |
 | test.cpp:31:7:31:13 | ... == ... |
 | test.cpp:42:13:42:20 | call to getABool |
@@ -57,3 +63,9 @@
 | test.cpp:145:6:145:21 | call to __builtin_expect |
 | test.cpp:152:7:152:8 | ! ... |
 | test.cpp:152:8:152:8 | b |
+| test.cpp:160:7:160:8 | ! ... |
+| test.cpp:160:8:160:8 | c |
+| test.cpp:168:7:168:8 | ! ... |
+| test.cpp:168:8:168:8 | b |
+| test.cpp:176:7:176:8 | ! ... |
+| test.cpp:176:8:176:8 | c |
--- a/cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.expected
+++ b/cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.expected
@@ -405,10 +405,78 @@
 | 158 | p != 0 when p is true |
 | 158 | p == 0 when ! ... is true |
 | 158 | p == 0 when p is false |
+| 160 | ! ... != 0 when ! ... is true |
+| 160 | ! ... != 0 when c is false |
+| 160 | ! ... != 1 when ! ... is false |
+| 160 | ! ... != 1 when c is true |
+| 160 | ! ... == 0 when ! ... is false |
+| 160 | ! ... == 0 when c is true |
+| 160 | ! ... == 1 when ! ... is true |
+| 160 | ! ... == 1 when c is false |
+| 160 | ... != ... != 0 when ! ... is false |
+| 160 | ... != ... != 0 when c is true |
+| 160 | ... != ... != 1 when ! ... is true |
+| 160 | ... != ... != 1 when c is false |
+| 160 | ... != ... == 0 when ! ... is true |
+| 160 | ... != ... == 0 when c is false |
+| 160 | ... != ... == 1 when ! ... is false |
+| 160 | ... != ... == 1 when c is true |
+| 160 | a != b+0 when ! ... is false |
+| 160 | a != b+0 when c is true |
+| 160 | a == b+0 when ! ... is true |
+| 160 | a == b+0 when c is false |
+| 160 | b != a+0 when ! ... is false |
+| 160 | b != a+0 when c is true |
+| 160 | b == a+0 when ! ... is true |
+| 160 | b == a+0 when c is false |
+| 160 | c != 0 when ! ... is false |
+| 160 | c != 0 when c is true |
+| 160 | c != 1 when ! ... is true |
+| 160 | c != 1 when c is false |
+| 160 | c == 0 when ! ... is true |
+| 160 | c == 0 when c is false |
+| 160 | c == 1 when ! ... is false |
+| 160 | c == 1 when c is true |
 | 164 | s != 0 when s is true |
 | 164 | s != 1 when s is false |
 | 164 | s == 0 when s is false |
 | 164 | s == 1 when s is true |
+| 168 | 10 < a+0 when ! ... is false |
+| 168 | 10 < a+0 when b is true |
+| 168 | 10 >= a+0 when ! ... is true |
+| 168 | 10 >= a+0 when b is false |
+| 168 | ! ... != 0 when ! ... is true |
+| 168 | ! ... != 0 when b is false |
+| 168 | ! ... != 1 when ! ... is false |
+| 168 | ! ... != 1 when b is true |
+| 168 | ! ... == 0 when ! ... is false |
+| 168 | ! ... == 0 when b is true |
+| 168 | ! ... == 1 when ! ... is true |
+| 168 | ! ... == 1 when b is false |
+| 168 | ... > ... != 0 when ! ... is false |
+| 168 | ... > ... != 0 when b is true |
+| 168 | ... > ... != 1 when ! ... is true |
+| 168 | ... > ... != 1 when b is false |
+| 168 | ... > ... == 0 when ! ... is true |
+| 168 | ... > ... == 0 when b is false |
+| 168 | ... > ... == 1 when ! ... is false |
+| 168 | ... > ... == 1 when b is true |
+| 168 | a < 10+1 when ! ... is true |
+| 168 | a < 10+1 when b is false |
+| 168 | a < 11 when ! ... is true |
+| 168 | a < 11 when b is false |
+| 168 | a >= 10+1 when ! ... is false |
+| 168 | a >= 10+1 when b is true |
+| 168 | a >= 11 when ! ... is false |
+| 168 | a >= 11 when b is true |
+| 168 | b != 0 when ! ... is false |
+| 168 | b != 0 when b is true |
+| 168 | b != 1 when ! ... is true |
+| 168 | b != 1 when b is false |
+| 168 | b == 0 when ! ... is true |
+| 168 | b == 0 when b is false |
+| 168 | b == 1 when ! ... is false |
+| 168 | b == 1 when b is true |
 | 170 | ! ... != 0 when ! ... is true |
 | 170 | ! ... != 0 when s is false |
 | 170 | ! ... != 1 when ! ... is false |
@@ -423,16 +491,44 @@
 | 170 | s == 0 when s is false |
 | 176 | ! ... != 0 when ! ... is true |
 | 176 | ! ... != 0 when ... < ... is false |
+| 176 | ! ... != 0 when c is false |
 | 176 | ! ... != 1 when ! ... is false |
 | 176 | ! ... != 1 when ... < ... is true |
+| 176 | ! ... != 1 when c is true |
 | 176 | ! ... == 0 when ! ... is false |
 | 176 | ! ... == 0 when ... < ... is true |
+| 176 | ! ... == 0 when c is true |
 | 176 | ! ... == 1 when ! ... is true |
 | 176 | ! ... == 1 when ... < ... is false |
+| 176 | ! ... == 1 when c is false |
 | 176 | ... < ... != 0 when ! ... is false |
 | 176 | ... < ... != 0 when ... < ... is true |
 | 176 | ... < ... == 0 when ! ... is true |
 | 176 | ... < ... == 0 when ... < ... is false |
+| 176 | ... > ... != 0 when ! ... is false |
+| 176 | ... > ... != 0 when c is true |
+| 176 | ... > ... != 1 when ! ... is true |
+| 176 | ... > ... != 1 when c is false |
+| 176 | ... > ... == 0 when ! ... is true |
+| 176 | ... > ... == 0 when c is false |
+| 176 | ... > ... == 1 when ! ... is false |
+| 176 | ... > ... == 1 when c is true |
+| 176 | a < b+1 when ! ... is true |
+| 176 | a < b+1 when c is false |
+| 176 | a >= b+1 when ! ... is false |
+| 176 | a >= b+1 when c is true |
+| 176 | b < a+0 when ! ... is false |
+| 176 | b < a+0 when c is true |
+| 176 | b >= a+0 when ! ... is true |
+| 176 | b >= a+0 when c is false |
+| 176 | c != 0 when ! ... is false |
+| 176 | c != 0 when c is true |
+| 176 | c != 1 when ! ... is true |
+| 176 | c != 1 when c is false |
+| 176 | c == 0 when ! ... is true |
+| 176 | c == 0 when c is false |
+| 176 | c == 1 when ! ... is false |
+| 176 | c == 1 when c is true |
 | 182 | 1.0 < foo+1 when ... < ... is false |
 | 182 | 1.0 >= foo+1 when ... && ... is true |
 | 182 | 1.0 >= foo+1 when ... < ... is true |
@@ -469,3 +565,39 @@
 | 182 | foo >= 1.0+0 when ... < ... is false |
 | 182 | foo >= 9.999999999999999547e-07+0 when ... && ... is true |
 | 182 | foo >= 9.999999999999999547e-07+0 when ... >= ... is true |
+| 190 | ! ... != 0 when ! ... is true |
+| 190 | ! ... != 0 when c is false |
+| 190 | ! ... != 1 when ! ... is false |
+| 190 | ! ... != 1 when c is true |
+| 190 | ! ... == 0 when ! ... is false |
+| 190 | ! ... == 0 when c is true |
+| 190 | ! ... == 1 when ! ... is true |
+| 190 | ! ... == 1 when c is false |
+| 190 | c != 0 when ! ... is false |
+| 190 | c != 0 when c is true |
+| 190 | c == 0 when ! ... is true |
+| 190 | c == 0 when c is false |
+| 198 | ! ... != 0 when ! ... is true |
+| 198 | ! ... != 0 when b is false |
+| 198 | ! ... != 1 when ! ... is false |
+| 198 | ! ... != 1 when b is true |
+| 198 | ! ... == 0 when ! ... is false |
+| 198 | ! ... == 0 when b is true |
+| 198 | ! ... == 1 when ! ... is true |
+| 198 | ! ... == 1 when b is false |
+| 198 | b != 0 when ! ... is false |
+| 198 | b != 0 when b is true |
+| 198 | b == 0 when ! ... is true |
+| 198 | b == 0 when b is false |
+| 206 | ! ... != 0 when ! ... is true |
+| 206 | ! ... != 0 when c is false |
+| 206 | ! ... != 1 when ! ... is false |
+| 206 | ! ... != 1 when c is true |
+| 206 | ! ... == 0 when ! ... is false |
+| 206 | ! ... == 0 when c is true |
+| 206 | ! ... == 1 when ! ... is true |
+| 206 | ! ... == 1 when c is false |
+| 206 | c != 0 when ! ... is false |
+| 206 | c != 0 when c is true |
+| 206 | c == 0 when ! ... is true |
+| 206 | c == 0 when c is false |
--- a/cpp/ql/test/library-tests/controlflow/guards/GuardsControl.expected
+++ b/cpp/ql/test/library-tests/controlflow/guards/GuardsControl.expected
@@ -93,6 +93,12 @@
 | test.c:182:10:182:33 | ... && ... | false | 182 | 184 |
 | test.c:182:10:182:33 | ... && ... | true | 181 | 182 |
 | test.c:182:25:182:33 | ... < ... | true | 181 | 182 |
+| test.c:190:7:190:8 | ! ... | true | 190 | 192 |
+| test.c:190:8:190:8 | c | false | 190 | 192 |
+| test.c:198:7:198:8 | ! ... | true | 198 | 200 |
+| test.c:198:8:198:8 | b | false | 198 | 200 |
+| test.c:206:7:206:8 | ! ... | true | 206 | 208 |
+| test.c:206:8:206:8 | c | false | 206 | 208 |
 | test.cpp:18:8:18:10 | call to get | true | 19 | 19 |
 | test.cpp:31:7:31:13 | ... == ... | false | 30 | 30 |
 | test.cpp:31:7:31:13 | ... == ... | false | 34 | 34 |
@@ -118,3 +124,9 @@
 | test.cpp:145:6:145:21 | call to __builtin_expect | true | 145 | 146 |
 | test.cpp:152:7:152:8 | ! ... | true | 152 | 153 |
 | test.cpp:152:8:152:8 | b | false | 152 | 153 |
+| test.cpp:160:7:160:8 | ! ... | true | 160 | 162 |
+| test.cpp:160:8:160:8 | c | false | 160 | 162 |
+| test.cpp:168:7:168:8 | ! ... | true | 168 | 170 |
+| test.cpp:168:8:168:8 | b | false | 168 | 170 |
+| test.cpp:176:7:176:8 | ! ... | true | 176 | 178 |
+| test.cpp:176:8:176:8 | c | false | 176 | 178 |
--- a/cpp/ql/test/library-tests/controlflow/guards/GuardsEnsure.expected
+++ b/cpp/ql/test/library-tests/controlflow/guards/GuardsEnsure.expected
@@ -195,6 +195,18 @@ binary
 | test.cpp:152:7:152:8 | ! ... | test.cpp:151:12:151:13 | 10 | < | test.cpp:151:8:151:8 | a | 1 | 152 | 153 |
 | test.cpp:152:8:152:8 | b | test.cpp:151:8:151:8 | a | >= | test.cpp:151:12:151:13 | 10 | 0 | 152 | 153 |
 | test.cpp:152:8:152:8 | b | test.cpp:151:12:151:13 | 10 | < | test.cpp:151:8:151:8 | a | 1 | 152 | 153 |
+| test.cpp:160:7:160:8 | ! ... | test.cpp:158:12:158:12 | a | == | test.cpp:158:17:158:17 | b | 0 | 160 | 162 |
+| test.cpp:160:7:160:8 | ! ... | test.cpp:158:17:158:17 | b | == | test.cpp:158:12:158:12 | a | 0 | 160 | 162 |
+| test.cpp:160:8:160:8 | c | test.cpp:158:12:158:12 | a | == | test.cpp:158:17:158:17 | b | 0 | 160 | 162 |
+| test.cpp:160:8:160:8 | c | test.cpp:158:17:158:17 | b | == | test.cpp:158:12:158:12 | a | 0 | 160 | 162 |
+| test.cpp:168:7:168:8 | ! ... | test.cpp:166:12:166:12 | a | < | test.cpp:166:16:166:17 | 10 | 1 | 168 | 170 |
+| test.cpp:168:7:168:8 | ! ... | test.cpp:166:16:166:17 | 10 | >= | test.cpp:166:12:166:12 | a | 0 | 168 | 170 |
+| test.cpp:168:8:168:8 | b | test.cpp:166:12:166:12 | a | < | test.cpp:166:16:166:17 | 10 | 1 | 168 | 170 |
+| test.cpp:168:8:168:8 | b | test.cpp:166:16:166:17 | 10 | >= | test.cpp:166:12:166:12 | a | 0 | 168 | 170 |
+| test.cpp:176:7:176:8 | ! ... | test.cpp:174:12:174:12 | a | < | test.cpp:174:16:174:16 | b | 1 | 176 | 178 |
+| test.cpp:176:7:176:8 | ! ... | test.cpp:174:16:174:16 | b | >= | test.cpp:174:12:174:12 | a | 0 | 176 | 178 |
+| test.cpp:176:8:176:8 | c | test.cpp:174:12:174:12 | a | < | test.cpp:174:16:174:16 | b | 1 | 176 | 178 |
+| test.cpp:176:8:176:8 | c | test.cpp:174:16:174:16 | b | >= | test.cpp:174:12:174:12 | a | 0 | 176 | 178 |
 unary
 | test.c:7:9:7:13 | ... > ... | test.c:7:9:7:9 | x | < | 1 | 10 | 11 |
 | test.c:7:9:7:13 | ... > ... | test.c:7:9:7:9 | x | >= | 1 | 7 | 9 |
@@ -500,6 +512,24 @@ unary
 | test.c:182:10:182:33 | ... && ... | test.c:182:25:182:33 | ... < ... | == | 1 | 181 | 182 |
 | test.c:182:25:182:33 | ... < ... | test.c:182:25:182:33 | ... < ... | != | 0 | 181 | 182 |
 | test.c:182:25:182:33 | ... < ... | test.c:182:25:182:33 | ... < ... | == | 1 | 181 | 182 |
+| test.c:190:7:190:8 | ! ... | test.c:190:7:190:8 | ! ... | != | 0 | 190 | 192 |
+| test.c:190:7:190:8 | ! ... | test.c:190:7:190:8 | ! ... | == | 1 | 190 | 192 |
+| test.c:190:7:190:8 | ! ... | test.c:190:8:190:8 | c | == | 0 | 190 | 192 |
+| test.c:190:8:190:8 | c | test.c:190:7:190:8 | ! ... | != | 0 | 190 | 192 |
+| test.c:190:8:190:8 | c | test.c:190:7:190:8 | ! ... | == | 1 | 190 | 192 |
+| test.c:190:8:190:8 | c | test.c:190:8:190:8 | c | == | 0 | 190 | 192 |
+| test.c:198:7:198:8 | ! ... | test.c:198:7:198:8 | ! ... | != | 0 | 198 | 200 |
+| test.c:198:7:198:8 | ! ... | test.c:198:7:198:8 | ! ... | == | 1 | 198 | 200 |
+| test.c:198:7:198:8 | ! ... | test.c:198:8:198:8 | b | == | 0 | 198 | 200 |
+| test.c:198:8:198:8 | b | test.c:198:7:198:8 | ! ... | != | 0 | 198 | 200 |
+| test.c:198:8:198:8 | b | test.c:198:7:198:8 | ! ... | == | 1 | 198 | 200 |
+| test.c:198:8:198:8 | b | test.c:198:8:198:8 | b | == | 0 | 198 | 200 |
+| test.c:206:7:206:8 | ! ... | test.c:206:7:206:8 | ! ... | != | 0 | 206 | 208 |
+| test.c:206:7:206:8 | ! ... | test.c:206:7:206:8 | ! ... | == | 1 | 206 | 208 |
+| test.c:206:7:206:8 | ! ... | test.c:206:8:206:8 | c | == | 0 | 206 | 208 |
+| test.c:206:8:206:8 | c | test.c:206:7:206:8 | ! ... | != | 0 | 206 | 208 |
+| test.c:206:8:206:8 | c | test.c:206:7:206:8 | ! ... | == | 1 | 206 | 208 |
+| test.c:206:8:206:8 | c | test.c:206:8:206:8 | c | == | 0 | 206 | 208 |
 | test.cpp:18:8:18:10 | call to get | test.cpp:18:8:18:10 | call to get | != | 0 | 19 | 19 |
 | test.cpp:18:8:18:10 | call to get | test.cpp:18:8:18:10 | call to get | == | 1 | 19 | 19 |
 | test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:7 | x | != | -1 | 30 | 30 |
@@ -568,3 +598,41 @@ unary
 | test.cpp:152:8:152:8 | b | test.cpp:152:7:152:8 | ! ... | == | 1 | 152 | 153 |
 | test.cpp:152:8:152:8 | b | test.cpp:152:8:152:8 | b | != | 1 | 152 | 153 |
 | test.cpp:152:8:152:8 | b | test.cpp:152:8:152:8 | b | == | 0 | 152 | 153 |
+| test.cpp:160:7:160:8 | ! ... | test.cpp:158:12:158:17 | ... != ... | != | 1 | 160 | 162 |
+| test.cpp:160:7:160:8 | ! ... | test.cpp:158:12:158:17 | ... != ... | == | 0 | 160 | 162 |
+| test.cpp:160:7:160:8 | ! ... | test.cpp:160:7:160:8 | ! ... | != | 0 | 160 | 162 |
+| test.cpp:160:7:160:8 | ! ... | test.cpp:160:7:160:8 | ! ... | == | 1 | 160 | 162 |
+| test.cpp:160:7:160:8 | ! ... | test.cpp:160:8:160:8 | c | != | 1 | 160 | 162 |
+| test.cpp:160:7:160:8 | ! ... | test.cpp:160:8:160:8 | c | == | 0 | 160 | 162 |
+| test.cpp:160:8:160:8 | c | test.cpp:158:12:158:17 | ... != ... | != | 1 | 160 | 162 |
+| test.cpp:160:8:160:8 | c | test.cpp:158:12:158:17 | ... != ... | == | 0 | 160 | 162 |
+| test.cpp:160:8:160:8 | c | test.cpp:160:7:160:8 | ! ... | != | 0 | 160 | 162 |
+| test.cpp:160:8:160:8 | c | test.cpp:160:7:160:8 | ! ... | == | 1 | 160 | 162 |
+| test.cpp:160:8:160:8 | c | test.cpp:160:8:160:8 | c | != | 1 | 160 | 162 |
+| test.cpp:160:8:160:8 | c | test.cpp:160:8:160:8 | c | == | 0 | 160 | 162 |
+| test.cpp:168:7:168:8 | ! ... | test.cpp:166:12:166:12 | a | < | 11 | 168 | 170 |
+| test.cpp:168:7:168:8 | ! ... | test.cpp:166:12:166:17 | ... > ... | != | 1 | 168 | 170 |
+| test.cpp:168:7:168:8 | ! ... | test.cpp:166:12:166:17 | ... > ... | == | 0 | 168 | 170 |
+| test.cpp:168:7:168:8 | ! ... | test.cpp:168:7:168:8 | ! ... | != | 0 | 168 | 170 |
+| test.cpp:168:7:168:8 | ! ... | test.cpp:168:7:168:8 | ! ... | == | 1 | 168 | 170 |
+| test.cpp:168:7:168:8 | ! ... | test.cpp:168:8:168:8 | b | != | 1 | 168 | 170 |
+| test.cpp:168:7:168:8 | ! ... | test.cpp:168:8:168:8 | b | == | 0 | 168 | 170 |
+| test.cpp:168:8:168:8 | b | test.cpp:166:12:166:12 | a | < | 11 | 168 | 170 |
+| test.cpp:168:8:168:8 | b | test.cpp:166:12:166:17 | ... > ... | != | 1 | 168 | 170 |
+| test.cpp:168:8:168:8 | b | test.cpp:166:12:166:17 | ... > ... | == | 0 | 168 | 170 |
+| test.cpp:168:8:168:8 | b | test.cpp:168:7:168:8 | ! ... | != | 0 | 168 | 170 |
+| test.cpp:168:8:168:8 | b | test.cpp:168:7:168:8 | ! ... | == | 1 | 168 | 170 |
+| test.cpp:168:8:168:8 | b | test.cpp:168:8:168:8 | b | != | 1 | 168 | 170 |
+| test.cpp:168:8:168:8 | b | test.cpp:168:8:168:8 | b | == | 0 | 168 | 170 |
+| test.cpp:176:7:176:8 | ! ... | test.cpp:174:12:174:16 | ... > ... | != | 1 | 176 | 178 |
+| test.cpp:176:7:176:8 | ! ... | test.cpp:174:12:174:16 | ... > ... | == | 0 | 176 | 178 |
+| test.cpp:176:7:176:8 | ! ... | test.cpp:176:7:176:8 | ! ... | != | 0 | 176 | 178 |
+| test.cpp:176:7:176:8 | ! ... | test.cpp:176:7:176:8 | ! ... | == | 1 | 176 | 178 |
+| test.cpp:176:7:176:8 | ! ... | test.cpp:176:8:176:8 | c | != | 1 | 176 | 178 |
+| test.cpp:176:7:176:8 | ! ... | test.cpp:176:8:176:8 | c | == | 0 | 176 | 178 |
+| test.cpp:176:8:176:8 | c | test.cpp:174:12:174:16 | ... > ... | != | 1 | 176 | 178 |
+| test.cpp:176:8:176:8 | c | test.cpp:174:12:174:16 | ... > ... | == | 0 | 176 | 178 |
+| test.cpp:176:8:176:8 | c | test.cpp:176:7:176:8 | ! ... | != | 0 | 176 | 178 |
+| test.cpp:176:8:176:8 | c | test.cpp:176:7:176:8 | ! ... | == | 1 | 176 | 178 |
+| test.cpp:176:8:176:8 | c | test.cpp:176:8:176:8 | c | != | 1 | 176 | 178 |
+| test.cpp:176:8:176:8 | c | test.cpp:176:8:176:8 | c | == | 0 | 176 | 178 |
--- a/cpp/ql/test/library-tests/controlflow/guards/test.c
+++ b/cpp/ql/test/library-tests/controlflow/guards/test.c
@@ -182,4 +182,28 @@ void test11(double foo) {
    if(!(foo >= 1e-6 && foo < 1.0)) {

    }
+}
+
+void test12(int a, int b) {
+  int c = a != b;
+
+  if (!c) {
+
+  }
+}
+
+void test13(int a) {
+  int b = a > 10;
+
+  if (!b) {
+
+  }
+}
+
+void test14(int a, int b) {
+  int c = a > b;
+
+  if (!c) {
+
+  }
 }
--- a/cpp/ql/test/library-tests/controlflow/guards/test.cpp
+++ b/cpp/ql/test/library-tests/controlflow/guards/test.cpp
@@ -152,4 +152,28 @@ void test_with_reference(bool& b, int a) {
   if(!b) {
      use(a);
   }
+}
+
+void test_with_negated_binary_equality(int a, int b) {
+  bool c = a != b;
+
+  if (!c) {
+
+  }
+}
+
+void test_with_negated_unary_relational(int a) {
+  bool b = a > 10;
+
+  if (!b) {
+
+  }
+}
+
+void test_with_negated_binary_relational(int a, int b) {
+  bool c = a > b;
+
+  if (!c) {
+
+  }
 }