Skip to content

Commit 97f0c75

Browse files
committed
C++: Accept test changes.
1 parent 44cc19c commit 97f0c75

File tree

3 files changed

+40
-25
lines changed

3 files changed

+40
-25
lines changed

cpp/ql/test/library-tests/dataflow/dataflow-tests/BarrierGuard.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,5 @@ void test_guard_and_reassign() {
8383
if(!guarded(x)) {
8484
x = 0;
8585
}
86-
sink(x); // $ SPURIOUS: ast,ir
86+
sink(x); // $ SPURIOUS: ast
8787
}

cpp/ql/test/library-tests/dataflow/dataflow-tests/localFlow-ir.expected

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -69,45 +69,61 @@
6969
| test.cpp:8:8:8:9 | t1 | test.cpp:9:8:9:9 | t1 |
7070
| test.cpp:9:8:9:9 | t1 | test.cpp:11:7:11:8 | t1 |
7171
| test.cpp:9:8:9:9 | t1 | test.cpp:11:7:11:8 | t1 |
72+
| test.cpp:10:8:10:9 | t2 | test.cpp:11:7:11:8 | Phi input |
73+
| test.cpp:10:8:10:9 | t2 | test.cpp:11:7:11:8 | Phi input |
7274
| test.cpp:10:8:10:9 | t2 | test.cpp:13:10:13:11 | t2 |
73-
| test.cpp:10:8:10:9 | t2 | test.cpp:15:3:15:6 | Phi |
74-
| test.cpp:10:8:10:9 | t2 | test.cpp:15:3:15:6 | Phi |
75+
| test.cpp:11:7:11:8 | Phi input | test.cpp:15:3:15:6 | SSA phi read(t2) |
76+
| test.cpp:11:7:11:8 | Phi input | test.cpp:15:3:15:6 | SSA phi(*t2) |
7577
| test.cpp:11:7:11:8 | t1 | test.cpp:21:8:21:9 | t1 |
7678
| test.cpp:12:5:12:10 | ... = ... | test.cpp:13:10:13:11 | t2 |
7779
| test.cpp:12:10:12:10 | 0 | test.cpp:12:5:12:10 | ... = ... |
78-
| test.cpp:13:10:13:11 | t2 | test.cpp:15:3:15:6 | Phi |
79-
| test.cpp:13:10:13:11 | t2 | test.cpp:15:3:15:6 | Phi |
80-
| test.cpp:15:3:15:6 | Phi | test.cpp:15:8:15:9 | t2 |
81-
| test.cpp:15:3:15:6 | Phi | test.cpp:15:8:15:9 | t2 |
82-
| test.cpp:15:8:15:9 | t2 | test.cpp:23:19:23:19 | Phi |
83-
| test.cpp:15:8:15:9 | t2 | test.cpp:23:19:23:19 | Phi |
80+
| test.cpp:13:5:13:8 | Phi input | test.cpp:15:3:15:6 | SSA phi read(t2) |
81+
| test.cpp:13:5:13:8 | Phi input | test.cpp:15:3:15:6 | SSA phi(*t2) |
82+
| test.cpp:13:10:13:11 | t2 | test.cpp:13:5:13:8 | Phi input |
83+
| test.cpp:13:10:13:11 | t2 | test.cpp:13:5:13:8 | Phi input |
84+
| test.cpp:15:3:15:6 | SSA phi read(t2) | test.cpp:15:8:15:9 | t2 |
85+
| test.cpp:15:3:15:6 | SSA phi(*t2) | test.cpp:15:8:15:9 | t2 |
86+
| test.cpp:15:8:15:9 | t2 | test.cpp:23:15:23:16 | Phi input |
87+
| test.cpp:15:8:15:9 | t2 | test.cpp:23:15:23:16 | Phi input |
8488
| test.cpp:17:3:17:8 | ... = ... | test.cpp:21:8:21:9 | t1 |
8589
| test.cpp:17:8:17:8 | 0 | test.cpp:17:3:17:8 | ... = ... |
86-
| test.cpp:21:8:21:9 | t1 | test.cpp:23:19:23:19 | Phi |
87-
| test.cpp:21:8:21:9 | t1 | test.cpp:23:19:23:19 | Phi |
90+
| test.cpp:21:8:21:9 | t1 | test.cpp:23:15:23:16 | Phi input |
91+
| test.cpp:21:8:21:9 | t1 | test.cpp:23:15:23:16 | Phi input |
8892
| test.cpp:23:15:23:16 | 0 | test.cpp:23:15:23:16 | 0 |
89-
| test.cpp:23:15:23:16 | 0 | test.cpp:23:19:23:19 | Phi |
90-
| test.cpp:23:19:23:19 | Phi | test.cpp:23:19:23:19 | i |
91-
| test.cpp:23:19:23:19 | Phi | test.cpp:23:19:23:19 | i |
92-
| test.cpp:23:19:23:19 | Phi | test.cpp:23:23:23:24 | t1 |
93-
| test.cpp:23:19:23:19 | Phi | test.cpp:23:23:23:24 | t1 |
94-
| test.cpp:23:19:23:19 | Phi | test.cpp:24:10:24:11 | t2 |
95-
| test.cpp:23:19:23:19 | Phi | test.cpp:24:10:24:11 | t2 |
93+
| test.cpp:23:15:23:16 | 0 | test.cpp:23:15:23:16 | Phi input |
94+
| test.cpp:23:15:23:16 | Phi input | test.cpp:23:19:23:19 | SSA phi read(*t2) |
95+
| test.cpp:23:15:23:16 | Phi input | test.cpp:23:19:23:19 | SSA phi read(i) |
96+
| test.cpp:23:15:23:16 | Phi input | test.cpp:23:19:23:19 | SSA phi read(t1) |
97+
| test.cpp:23:15:23:16 | Phi input | test.cpp:23:19:23:19 | SSA phi read(t2) |
98+
| test.cpp:23:15:23:16 | Phi input | test.cpp:23:19:23:19 | SSA phi(*i) |
99+
| test.cpp:23:15:23:16 | Phi input | test.cpp:23:19:23:19 | SSA phi(*t1) |
100+
| test.cpp:23:19:23:19 | SSA phi read(*t2) | test.cpp:24:10:24:11 | t2 |
101+
| test.cpp:23:19:23:19 | SSA phi read(i) | test.cpp:23:19:23:19 | i |
102+
| test.cpp:23:19:23:19 | SSA phi read(t1) | test.cpp:23:23:23:24 | t1 |
103+
| test.cpp:23:19:23:19 | SSA phi read(t2) | test.cpp:24:10:24:11 | t2 |
104+
| test.cpp:23:19:23:19 | SSA phi(*i) | test.cpp:23:19:23:19 | i |
105+
| test.cpp:23:19:23:19 | SSA phi(*t1) | test.cpp:23:23:23:24 | t1 |
96106
| test.cpp:23:19:23:19 | i | test.cpp:23:27:23:27 | i |
97107
| test.cpp:23:19:23:19 | i | test.cpp:23:27:23:27 | i |
98-
| test.cpp:23:23:23:24 | t1 | test.cpp:23:19:23:19 | Phi |
108+
| test.cpp:23:23:23:24 | t1 | test.cpp:23:27:23:29 | Phi input |
99109
| test.cpp:23:23:23:24 | t1 | test.cpp:26:8:26:9 | t1 |
100110
| test.cpp:23:23:23:24 | t1 | test.cpp:26:8:26:9 | t1 |
101111
| test.cpp:23:27:23:27 | *i | test.cpp:23:27:23:27 | *i |
102112
| test.cpp:23:27:23:27 | *i | test.cpp:23:27:23:27 | i |
103-
| test.cpp:23:27:23:27 | i | test.cpp:23:19:23:19 | Phi |
104113
| test.cpp:23:27:23:27 | i | test.cpp:23:27:23:27 | i |
105114
| test.cpp:23:27:23:27 | i | test.cpp:23:27:23:27 | i |
106-
| test.cpp:23:27:23:29 | ... ++ | test.cpp:23:19:23:19 | Phi |
115+
| test.cpp:23:27:23:27 | i | test.cpp:23:27:23:29 | Phi input |
107116
| test.cpp:23:27:23:29 | ... ++ | test.cpp:23:27:23:29 | ... ++ |
108-
| test.cpp:24:5:24:11 | ... = ... | test.cpp:23:19:23:19 | Phi |
109-
| test.cpp:24:10:24:11 | t2 | test.cpp:23:19:23:19 | Phi |
110-
| test.cpp:24:10:24:11 | t2 | test.cpp:23:19:23:19 | Phi |
117+
| test.cpp:23:27:23:29 | ... ++ | test.cpp:23:27:23:29 | Phi input |
118+
| test.cpp:23:27:23:29 | Phi input | test.cpp:23:19:23:19 | SSA phi read(*t2) |
119+
| test.cpp:23:27:23:29 | Phi input | test.cpp:23:19:23:19 | SSA phi read(i) |
120+
| test.cpp:23:27:23:29 | Phi input | test.cpp:23:19:23:19 | SSA phi read(t1) |
121+
| test.cpp:23:27:23:29 | Phi input | test.cpp:23:19:23:19 | SSA phi read(t2) |
122+
| test.cpp:23:27:23:29 | Phi input | test.cpp:23:19:23:19 | SSA phi(*i) |
123+
| test.cpp:23:27:23:29 | Phi input | test.cpp:23:19:23:19 | SSA phi(*t1) |
124+
| test.cpp:24:5:24:11 | ... = ... | test.cpp:23:27:23:29 | Phi input |
125+
| test.cpp:24:10:24:11 | t2 | test.cpp:23:27:23:29 | Phi input |
126+
| test.cpp:24:10:24:11 | t2 | test.cpp:23:27:23:29 | Phi input |
111127
| test.cpp:24:10:24:11 | t2 | test.cpp:24:5:24:11 | ... = ... |
112128
| test.cpp:382:48:382:54 | source1 | test.cpp:384:16:384:23 | *& ... |
113129
| test.cpp:383:12:383:13 | 0 | test.cpp:383:12:383:13 | 0 |

cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ irFlow
142142
| BarrierGuard.cpp:49:10:49:15 | call to source | BarrierGuard.cpp:55:13:55:13 | x |
143143
| BarrierGuard.cpp:60:11:60:16 | call to source | BarrierGuard.cpp:64:14:64:14 | x |
144144
| BarrierGuard.cpp:60:11:60:16 | call to source | BarrierGuard.cpp:66:14:66:14 | x |
145-
| BarrierGuard.cpp:81:11:81:16 | call to source | BarrierGuard.cpp:86:8:86:8 | x |
146145
| acrossLinkTargets.cpp:19:27:19:32 | call to source | acrossLinkTargets.cpp:12:8:12:8 | x |
147146
| clang.cpp:12:9:12:20 | sourceArray1 | clang.cpp:18:8:18:19 | sourceArray1 |
148147
| clang.cpp:12:9:12:20 | sourceArray1 | clang.cpp:23:17:23:29 | *& ... |

0 commit comments

Comments
 (0)