C++: Accept changes in controlflow/guards following removal of aliased SSA

Author: igfoo

cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.expected

@@ -628,50 +628,22 @@
 | test.cpp:145:23:145:29 | ... != ... | a == 42+0 when ... != ... is false |
 | test.cpp:151:8:151:13 | ... < ... | 10 < a+1 when ... < ... is false |
 | test.cpp:151:8:151:13 | ... < ... | 10 >= a+1 when ... < ... is true |
-| test.cpp:151:8:151:13 | ... < ... | ... < ... != 0 when ... < ... is true |
-| test.cpp:151:8:151:13 | ... < ... | ... < ... != 1 when ... < ... is false |
-| test.cpp:151:8:151:13 | ... < ... | ... < ... == 0 when ... < ... is false |
-| test.cpp:151:8:151:13 | ... < ... | ... < ... == 1 when ... < ... is true |
 | test.cpp:151:8:151:13 | ... < ... | a < 10 when ... < ... is true |
 | test.cpp:151:8:151:13 | ... < ... | a < 10+0 when ... < ... is true |
 | test.cpp:151:8:151:13 | ... < ... | a >= 10 when ... < ... is false |
 | test.cpp:151:8:151:13 | ... < ... | a >= 10+0 when ... < ... is false |
-| test.cpp:151:8:151:13 | ... < ... | b != 0 when ... < ... is true |
-| test.cpp:151:8:151:13 | ... < ... | b != 1 when ... < ... is false |
-| test.cpp:151:8:151:13 | ... < ... | b == 0 when ... < ... is false |
-| test.cpp:151:8:151:13 | ... < ... | b == 1 when ... < ... is true |
-| test.cpp:152:7:152:8 | ! ... | 10 < a+1 when ! ... is true |
-| test.cpp:152:7:152:8 | ! ... | 10 >= a+1 when ! ... is false |
 | test.cpp:152:7:152:8 | ! ... | ! ... != 0 when ! ... is true |
 | test.cpp:152:7:152:8 | ! ... | ! ... != 1 when ! ... is false |
 | test.cpp:152:7:152:8 | ! ... | ! ... == 0 when ! ... is false |
 | test.cpp:152:7:152:8 | ! ... | ! ... == 1 when ! ... is true |
-| test.cpp:152:7:152:8 | ! ... | ... < ... != 0 when ! ... is false |
-| test.cpp:152:7:152:8 | ! ... | ... < ... != 1 when ! ... is true |
-| test.cpp:152:7:152:8 | ! ... | ... < ... == 0 when ! ... is true |
-| test.cpp:152:7:152:8 | ! ... | ... < ... == 1 when ! ... is false |
-| test.cpp:152:7:152:8 | ! ... | a < 10 when ! ... is false |
-| test.cpp:152:7:152:8 | ! ... | a < 10+0 when ! ... is false |
-| test.cpp:152:7:152:8 | ! ... | a >= 10 when ! ... is true |
-| test.cpp:152:7:152:8 | ! ... | a >= 10+0 when ! ... is true |
 | test.cpp:152:7:152:8 | ! ... | b != 0 when ! ... is false |
 | test.cpp:152:7:152:8 | ! ... | b != 1 when ! ... is true |
 | test.cpp:152:7:152:8 | ! ... | b == 0 when ! ... is true |
 | test.cpp:152:7:152:8 | ! ... | b == 1 when ! ... is false |
-| test.cpp:152:8:152:8 | b | 10 < a+1 when b is false |
-| test.cpp:152:8:152:8 | b | 10 >= a+1 when b is true |
 | test.cpp:152:8:152:8 | b | ! ... != 0 when b is false |
 | test.cpp:152:8:152:8 | b | ! ... != 1 when b is true |
 | test.cpp:152:8:152:8 | b | ! ... == 0 when b is true |
 | test.cpp:152:8:152:8 | b | ! ... == 1 when b is false |
-| test.cpp:152:8:152:8 | b | ... < ... != 0 when b is true |
-| test.cpp:152:8:152:8 | b | ... < ... != 1 when b is false |
-| test.cpp:152:8:152:8 | b | ... < ... == 0 when b is false |
-| test.cpp:152:8:152:8 | b | ... < ... == 1 when b is true |
-| test.cpp:152:8:152:8 | b | a < 10 when b is true |
-| test.cpp:152:8:152:8 | b | a < 10+0 when b is true |
-| test.cpp:152:8:152:8 | b | a >= 10 when b is false |
-| test.cpp:152:8:152:8 | b | a >= 10+0 when b is false |
 | test.cpp:152:8:152:8 | b | b != 0 when b is true |
 | test.cpp:152:8:152:8 | b | b != 1 when b is false |
 | test.cpp:152:8:152:8 | b | b == 0 when b is false |

cpp/ql/test/library-tests/controlflow/guards/GuardsControl.expected

@@ -14,6 +14,7 @@
 | test.c:26:11:26:15 | ... > ... | false | test.c:42:29:44:16 | { ... } |
 | test.c:26:11:26:15 | ... > ... | false | test.c:45:13:45:20 | if (...) ...  |
 | test.c:26:11:26:15 | ... > ... | false | test.c:45:23:47:22 | { ... } |
+| test.c:26:11:26:15 | ... > ... | false | test.c:48:20:55:13 | { ... } |
 | test.c:26:11:26:15 | ... > ... | false | test.c:51:14:53:21 | { ... } |
 | test.c:26:11:26:15 | ... > ... | false | test.c:56:5:58:14 | label ...: |
 | test.c:26:11:26:15 | ... > ... | false | test.c:58:19:58:23 | y |
@@ -27,6 +28,7 @@
 | test.c:34:16:34:21 | ... < ... | false | test.c:42:29:44:16 | { ... } |
 | test.c:34:16:34:21 | ... < ... | false | test.c:45:13:45:20 | if (...) ...  |
 | test.c:34:16:34:21 | ... < ... | false | test.c:45:23:47:22 | { ... } |
+| test.c:34:16:34:21 | ... < ... | false | test.c:48:20:55:13 | { ... } |
 | test.c:34:16:34:21 | ... < ... | false | test.c:51:14:53:21 | { ... } |
 | test.c:34:16:34:21 | ... < ... | false | test.c:56:5:58:14 | label ...: |
 | test.c:34:16:34:21 | ... < ... | false | test.c:58:19:58:23 | y |
@@ -37,11 +39,13 @@
 | test.c:42:16:42:21 | ... < ... | true | test.c:42:29:44:16 | { ... } |
 | test.c:42:16:42:21 | ... < ... | true | test.c:45:13:45:20 | if (...) ...  |
 | test.c:42:16:42:21 | ... < ... | true | test.c:45:23:47:22 | { ... } |
+| test.c:42:16:42:21 | ... < ... | true | test.c:48:20:55:13 | { ... } |
 | test.c:42:16:42:21 | ... < ... | true | test.c:51:14:53:21 | { ... } |
-| test.c:44:12:44:16 | ... > ... | false | test.c:42:5:42:26 | label ...: |
 | test.c:44:12:44:16 | ... > ... | false | test.c:51:14:53:21 | { ... } |
 | test.c:44:12:44:16 | ... > ... | true | test.c:45:13:45:20 | if (...) ...  |
 | test.c:44:12:44:16 | ... > ... | true | test.c:45:23:47:22 | { ... } |
+| test.c:44:12:44:16 | ... > ... | true | test.c:48:20:55:13 | { ... } |
+| test.c:45:16:45:20 | ... > ... | false | test.c:48:20:55:13 | { ... } |
 | test.c:45:16:45:20 | ... > ... | true | test.c:45:23:47:22 | { ... } |
 | test.c:58:9:58:9 | x | not 0 | test.c:58:19:58:23 | y |
 | test.c:58:9:58:9 | x | not 0 | test.c:62:9:62:16 | return ... |