Skip to content

Commit 1af1ba4

Browse files
MathiasVPMathiasVP
committed
C++: Accept test changes.
1 parent 4d3076a commit 1af1ba4

File tree

3 files changed

+117
-52
lines changed

3 files changed

+117
-52
lines changed

‎cpp/ql/test/library-tests/ir/ir/aliased_ir.expected‎

Lines changed: 42 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1457,13 +1457,15 @@ ir.cpp:
14571457
# 43| m43_3(unknown) = InitializeNonLocal :
14581458
# 43| m43_4(unknown) = Chi : total:m43_2, partial:m43_3
14591459
# 44| r44_1(glval<int>) = VariableAddress[x] :
1460-
# 44| r44_2(int) = Constant[17] :
1461-
# 44| m44_3(int) = Store[x] : &:r44_1, r44_2
1460+
# 44| r44_2(int) = Constant[5] :
1461+
# 44| r44_3(int) = Constant[12] :
1462+
# 44| r44_4(int) = Add : r44_2, r44_3
1463+
# 44| m44_5(int) = Store[x] : &:r44_1, r44_4
14621464
# 45| r45_1(glval<short>) = VariableAddress[y] :
14631465
# 45| r45_2(short) = Constant[7] :
14641466
# 45| m45_3(short) = Store[y] : &:r45_1, r45_2
14651467
# 46| r46_1(glval<int>) = VariableAddress[x] :
1466-
# 46| r46_2(int) = Load[x] : &:r46_1, m44_3
1468+
# 46| r46_2(int) = Load[x] : &:r46_1, m44_5
14671469
# 46| r46_3(glval<short>) = VariableAddress[y] :
14681470
# 46| r46_4(short) = Load[y] : &:r46_3, m45_3
14691471
# 46| r46_5(int) = Convert : r46_4
@@ -1472,7 +1474,7 @@ ir.cpp:
14721474
# 46| r46_8(glval<short>) = VariableAddress[y] :
14731475
# 46| m46_9(short) = Store[y] : &:r46_8, r46_7
14741476
# 47| r47_1(glval<int>) = VariableAddress[x] :
1475-
# 47| r47_2(int) = Load[x] : &:r47_1, m44_3
1477+
# 47| r47_2(int) = Load[x] : &:r47_1, m44_5
14761478
# 47| r47_3(glval<short>) = VariableAddress[y] :
14771479
# 47| r47_4(short) = Load[y] : &:r47_3, m46_9
14781480
# 47| r47_5(int) = Convert : r47_4
@@ -6102,14 +6104,30 @@ ir.cpp:
61026104
# 913| m913_6(int) = InitializeParameter[x] : &:r913_5
61036105
# 914| r914_1(glval<bool>) = VariableAddress[a] :
61046106
# 914| r914_2(bool) = Constant[1] :
6105-
# 914| m914_3(bool) = Store[a] : &:r914_1, r914_2
6106-
# 915| r915_1(glval<int>) = VariableAddress[b] :
6107-
# 915| r915_2(bool) = Constant[1] :
6108-
# 915| v915_3(void) = ConditionalBranch : r915_2
6109-
#-----| False -> Block 2
6107+
# 914| v914_3(void) = ConditionalBranch : r914_2
6108+
#-----| False -> Block 4
6109+
#-----| True -> Block 2
6110+
6111+
# 914| Block 1
6112+
# 914| r914_4(glval<bool>) = VariableAddress[#temp914:12] :
6113+
# 914| r914_5(bool) = Constant[1] :
6114+
# 914| m914_6(bool) = Store[#temp914:12] : &:r914_4, r914_5
6115+
# 914| r914_7(glval<bool>) = VariableAddress[#temp914:12] :
6116+
# 914| r914_8(bool) = Load[#temp914:12] : &:r914_7, m914_6
6117+
# 914| m914_9(bool) = Store[a] : &:r914_1, r914_8
6118+
# 915| r915_1(glval<int>) = VariableAddress[b] :
6119+
# 915| r915_2(bool) = Constant[1] :
6120+
# 915| v915_3(void) = ConditionalBranch : r915_2
6121+
#-----| False -> Block 4
6122+
#-----| True -> Block 3
6123+
6124+
# 914| Block 2
6125+
# 914| r914_10(bool) = Constant[1] :
6126+
# 914| v914_11(void) = ConditionalBranch : r914_10
6127+
#-----| False -> Block 4
61106128
#-----| True -> Block 1
61116129

6112-
# 915| Block 1
6130+
# 915| Block 3
61136131
# 915| r915_4(glval<int>) = VariableAddress[x] :
61146132
# 915| r915_5(int) = Load[x] : &:r915_4, m913_6
61156133
# 915| r915_6(glval<int>) = VariableAddress[#temp915:11] :
@@ -6122,7 +6140,7 @@ ir.cpp:
61226140
# 913| v913_8(void) = AliasedUse : m913_3
61236141
# 913| v913_9(void) = ExitFunction :
61246142

6125-
# 913| Block 2
6143+
# 913| Block 4
61266144
# 913| v913_10(void) = Unreached :
61276145

61286146
# 949| void OperatorNew()
@@ -7718,15 +7736,17 @@ ir.cpp:
77187736
# 1215| r1215_4(glval<__attribute((vector_size(16UL))) int>) = VariableAddress[vi4] :
77197737
# 1215| r1215_5(__attribute((vector_size(16UL))) int) = Load[vi4] : &:r1215_4, m1214_8
77207738
# 1215| r1215_6(int) = Constant[3] :
7721-
# 1215| r1215_7(int) = Constant[2] :
7722-
# 1215| r1215_8(int) = Constant[1] :
7723-
# 1215| r1215_9(int) = Constant[0] :
7724-
# 1215| r1215_10(__attribute((vector_size(16))) int) = BuiltIn[__builtin_shufflevector] : 0:r1215_3, 1:r1215_5, 2:r1215_6, 3:r1215_7, 4:r1215_8, 5:r1215_9
7725-
# 1215| m1215_11(__attribute((vector_size(16UL))) int) = Store[vi4_shuffle] : &:r1215_1, r1215_10
7739+
# 1215| r1215_7(int) = Constant[0] :
7740+
# 1215| r1215_8(int) = Add : r1215_6, r1215_7
7741+
# 1215| r1215_9(int) = Constant[2] :
7742+
# 1215| r1215_10(int) = Constant[1] :
7743+
# 1215| r1215_11(int) = Constant[0] :
7744+
# 1215| r1215_12(__attribute((vector_size(16))) int) = BuiltIn[__builtin_shufflevector] : 0:r1215_3, 1:r1215_5, 2:r1215_8, 3:r1215_9, 4:r1215_10, 5:r1215_11
7745+
# 1215| m1215_13(__attribute((vector_size(16UL))) int) = Store[vi4_shuffle] : &:r1215_1, r1215_12
77267746
# 1216| r1216_1(glval<__attribute((vector_size(16UL))) int>) = VariableAddress[vi4] :
77277747
# 1216| r1216_2(__attribute((vector_size(16UL))) int) = Load[vi4] : &:r1216_1, m1214_8
77287748
# 1216| r1216_3(glval<__attribute((vector_size(16UL))) int>) = VariableAddress[vi4_shuffle] :
7729-
# 1216| r1216_4(__attribute((vector_size(16UL))) int) = Load[vi4_shuffle] : &:r1216_3, m1215_11
7749+
# 1216| r1216_4(__attribute((vector_size(16UL))) int) = Load[vi4_shuffle] : &:r1216_3, m1215_13
77307750
# 1216| r1216_5(__attribute((vector_size(16UL))) int) = Add : r1216_2, r1216_4
77317751
# 1216| r1216_6(glval<__attribute((vector_size(16UL))) int>) = VariableAddress[vi4] :
77327752
# 1216| m1216_7(__attribute((vector_size(16UL))) int) = Store[vi4] : &:r1216_6, r1216_5
@@ -15142,10 +15162,12 @@ ir.cpp:
1514215162
# 2381| m2381_3(unknown) = InitializeNonLocal :
1514315163
# 2381| m2381_4(unknown) = Chi : total:m2381_2, partial:m2381_3
1514415164
# 2382| r2382_1(glval<int>) = VariableAddress[#return] :
15145-
# 2382| r2382_2(int) = Constant[2] :
15146-
# 2382| m2382_3(int) = Store[#return] : &:r2382_1, r2382_2
15165+
# 2382| r2382_2(int) = Constant[1] :
15166+
# 2382| r2382_3(int) = Constant[1] :
15167+
# 2382| r2382_4(int) = Add : r2382_2, r2382_3
15168+
# 2382| m2382_5(int) = Store[#return] : &:r2382_1, r2382_4
1514715169
# 2381| r2381_5(glval<int>) = VariableAddress[#return] :
15148-
# 2381| v2381_6(void) = ReturnValue : &:r2381_5, m2382_3
15170+
# 2381| v2381_6(void) = ReturnValue : &:r2381_5, m2382_5
1514915171
# 2381| v2381_7(void) = AliasedUse : m2381_3
1515015172
# 2381| v2381_8(void) = ExitFunction :
1515115173

‎cpp/ql/test/library-tests/ir/ir/operand_locations.expected‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1668,13 +1668,15 @@
16681668
| ir.cpp:43:6:43:8 | ChiTotal | total:m43_2 |
16691669
| ir.cpp:43:6:43:8 | SideEffect | m43_3 |
16701670
| ir.cpp:44:9:44:9 | Address | &:r44_1 |
1671-
| ir.cpp:44:13:44:18 | StoreValue | r44_2 |
1671+
| ir.cpp:44:13:44:13 | Left | r44_2 |
1672+
| ir.cpp:44:13:44:18 | StoreValue | r44_4 |
1673+
| ir.cpp:44:17:44:18 | Right | r44_3 |
16721674
| ir.cpp:45:11:45:11 | Address | &:r45_1 |
16731675
| ir.cpp:45:15:45:15 | StoreValue | r45_2 |
16741676
| ir.cpp:46:5:46:5 | Address | &:r46_8 |
16751677
| ir.cpp:46:9:46:9 | Address | &:r46_1 |
16761678
| ir.cpp:46:9:46:9 | Left | r46_2 |
1677-
| ir.cpp:46:9:46:9 | Load | m44_3 |
1679+
| ir.cpp:46:9:46:9 | Load | m44_5 |
16781680
| ir.cpp:46:9:46:13 | StoreValue | r46_7 |
16791681
| ir.cpp:46:9:46:13 | Unary | r46_6 |
16801682
| ir.cpp:46:13:46:13 | Address | &:r46_3 |
@@ -1684,7 +1686,7 @@
16841686
| ir.cpp:47:5:47:5 | Address | &:r47_7 |
16851687
| ir.cpp:47:9:47:9 | Address | &:r47_1 |
16861688
| ir.cpp:47:9:47:9 | Left | r47_2 |
1687-
| ir.cpp:47:9:47:9 | Load | m44_3 |
1689+
| ir.cpp:47:9:47:9 | Load | m44_5 |
16881690
| ir.cpp:47:9:47:13 | StoreValue | r47_6 |
16891691
| ir.cpp:47:13:47:13 | Address | &:r47_3 |
16901692
| ir.cpp:47:13:47:13 | Load | m46_9 |
@@ -5227,7 +5229,13 @@
52275229
| ir.cpp:913:6:913:23 | SideEffect | m913_3 |
52285230
| ir.cpp:913:29:913:29 | Address | &:r913_5 |
52295231
| ir.cpp:914:8:914:8 | Address | &:r914_1 |
5230-
| ir.cpp:914:12:914:23 | StoreValue | r914_2 |
5232+
| ir.cpp:914:12:914:15 | Condition | r914_2 |
5233+
| ir.cpp:914:12:914:23 | Address | &:r914_4 |
5234+
| ir.cpp:914:12:914:23 | Address | &:r914_7 |
5235+
| ir.cpp:914:12:914:23 | Load | m914_6 |
5236+
| ir.cpp:914:12:914:23 | StoreValue | r914_5 |
5237+
| ir.cpp:914:12:914:23 | StoreValue | r914_8 |
5238+
| ir.cpp:914:20:914:23 | Condition | r914_10 |
52315239
| ir.cpp:915:7:915:7 | Address | &:r915_1 |
52325240
| ir.cpp:915:11:915:16 | Condition | r915_2 |
52335241
| ir.cpp:915:11:915:24 | Address | &:r915_6 |
@@ -6521,24 +6529,26 @@
65216529
| ir.cpp:1214:12:1214:12 | Load | m1213_7 |
65226530
| ir.cpp:1214:12:1214:12 | StoreValue | r1214_2 |
65236531
| ir.cpp:1215:18:1215:28 | Address | &:r1215_1 |
6524-
| ir.cpp:1215:32:1215:78 | Arg(2) | 2:r1215_6 |
6525-
| ir.cpp:1215:32:1215:78 | StoreValue | r1215_10 |
6532+
| ir.cpp:1215:32:1215:78 | Arg(2) | 2:r1215_8 |
6533+
| ir.cpp:1215:32:1215:78 | StoreValue | r1215_12 |
65266534
| ir.cpp:1215:56:1215:58 | Address | &:r1215_2 |
65276535
| ir.cpp:1215:56:1215:58 | Arg(0) | 0:r1215_3 |
65286536
| ir.cpp:1215:56:1215:58 | Load | m1214_8 |
65296537
| ir.cpp:1215:61:1215:63 | Address | &:r1215_4 |
65306538
| ir.cpp:1215:61:1215:63 | Arg(1) | 1:r1215_5 |
65316539
| ir.cpp:1215:61:1215:63 | Load | m1214_8 |
6532-
| ir.cpp:1215:71:1215:71 | Arg(3) | 3:r1215_7 |
6533-
| ir.cpp:1215:74:1215:74 | Arg(4) | 4:r1215_8 |
6534-
| ir.cpp:1215:77:1215:77 | Arg(5) | 5:r1215_9 |
6540+
| ir.cpp:1215:66:1215:66 | Left | r1215_6 |
6541+
| ir.cpp:1215:68:1215:68 | Right | r1215_7 |
6542+
| ir.cpp:1215:71:1215:71 | Arg(3) | 3:r1215_9 |
6543+
| ir.cpp:1215:74:1215:74 | Arg(4) | 4:r1215_10 |
6544+
| ir.cpp:1215:77:1215:77 | Arg(5) | 5:r1215_11 |
65356545
| ir.cpp:1216:3:1216:5 | Address | &:r1216_6 |
65366546
| ir.cpp:1216:9:1216:11 | Address | &:r1216_1 |
65376547
| ir.cpp:1216:9:1216:11 | Left | r1216_2 |
65386548
| ir.cpp:1216:9:1216:11 | Load | m1214_8 |
65396549
| ir.cpp:1216:9:1216:25 | StoreValue | r1216_5 |
65406550
| ir.cpp:1216:15:1216:25 | Address | &:r1216_3 |
6541-
| ir.cpp:1216:15:1216:25 | Load | m1215_11 |
6551+
| ir.cpp:1216:15:1216:25 | Load | m1215_13 |
65426552
| ir.cpp:1216:15:1216:25 | Right | r1216_4 |
65436553
| ir.cpp:1221:5:1221:21 | Address | &:r1221_7 |
65446554
| ir.cpp:1221:5:1221:21 | ChiPartial | partial:m1221_3 |
@@ -12533,10 +12543,12 @@
1253312543
| ir.cpp:2381:5:2381:49 | Address | &:r2381_5 |
1253412544
| ir.cpp:2381:5:2381:49 | ChiPartial | partial:m2381_3 |
1253512545
| ir.cpp:2381:5:2381:49 | ChiTotal | total:m2381_2 |
12536-
| ir.cpp:2381:5:2381:49 | Load | m2382_3 |
12546+
| ir.cpp:2381:5:2381:49 | Load | m2382_5 |
1253712547
| ir.cpp:2381:5:2381:49 | SideEffect | m2381_3 |
1253812548
| ir.cpp:2382:5:2382:17 | Address | &:r2382_1 |
12539-
| ir.cpp:2382:12:2382:16 | StoreValue | r2382_2 |
12549+
| ir.cpp:2382:12:2382:12 | Left | r2382_2 |
12550+
| ir.cpp:2382:12:2382:16 | StoreValue | r2382_4 |
12551+
| ir.cpp:2382:16:2382:16 | Right | r2382_3 |
1254012552
| ir.cpp:2392:5:2392:45 | Address | &:r2392_5 |
1254112553
| ir.cpp:2392:5:2392:45 | ChiPartial | partial:m2392_3 |
1254212554
| ir.cpp:2392:5:2392:45 | ChiTotal | total:m2392_2 |

‎cpp/ql/test/library-tests/ir/ir/raw_ir.expected‎

Lines changed: 51 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,8 +1357,10 @@ ir.cpp:
13571357
# 43| mu43_2(unknown) = AliasedDefinition :
13581358
# 43| mu43_3(unknown) = InitializeNonLocal :
13591359
# 44| r44_1(glval<int>) = VariableAddress[x] :
1360-
# 44| r44_2(int) = Constant[17] :
1361-
# 44| mu44_3(int) = Store[x] : &:r44_1, r44_2
1360+
# 44| r44_2(int) = Constant[5] :
1361+
# 44| r44_3(int) = Constant[12] :
1362+
# 44| r44_4(int) = Add : r44_2, r44_3
1363+
# 44| mu44_5(int) = Store[x] : &:r44_1, r44_4
13621364
# 45| r45_1(glval<short>) = VariableAddress[y] :
13631365
# 45| r45_2(short) = Constant[7] :
13641366
# 45| mu45_3(short) = Store[y] : &:r45_1, r45_2
@@ -5747,14 +5749,39 @@ ir.cpp:
57475749
# 913| mu913_5(int) = InitializeParameter[x] : &:r913_4
57485750
# 914| r914_1(glval<bool>) = VariableAddress[a] :
57495751
# 914| r914_2(bool) = Constant[1] :
5750-
# 914| mu914_3(bool) = Store[a] : &:r914_1, r914_2
5751-
# 915| r915_1(glval<int>) = VariableAddress[b] :
5752-
# 915| r915_2(bool) = Constant[1] :
5753-
# 915| v915_3(void) = ConditionalBranch : r915_2
5754-
#-----| False -> Block 3
5755-
#-----| True -> Block 2
5752+
# 914| v914_3(void) = ConditionalBranch : r914_2
5753+
#-----| False -> Block 1
5754+
#-----| True -> Block 4
5755+
5756+
# 914| Block 1
5757+
# 914| r914_4(glval<bool>) = VariableAddress[#temp914:12] :
5758+
# 914| r914_5(bool) = Constant[0] :
5759+
# 914| mu914_6(bool) = Store[#temp914:12] : &:r914_4, r914_5
5760+
#-----| Goto -> Block 2
5761+
5762+
# 914| Block 2
5763+
# 914| r914_7(glval<bool>) = VariableAddress[#temp914:12] :
5764+
# 914| r914_8(bool) = Load[#temp914:12] : &:r914_7, ~m?
5765+
# 914| mu914_9(bool) = Store[a] : &:r914_1, r914_8
5766+
# 915| r915_1(glval<int>) = VariableAddress[b] :
5767+
# 915| r915_2(bool) = Constant[1] :
5768+
# 915| v915_3(void) = ConditionalBranch : r915_2
5769+
#-----| False -> Block 7
5770+
#-----| True -> Block 6
57565771

5757-
# 915| Block 1
5772+
# 914| Block 3
5773+
# 914| r914_10(glval<bool>) = VariableAddress[#temp914:12] :
5774+
# 914| r914_11(bool) = Constant[1] :
5775+
# 914| mu914_12(bool) = Store[#temp914:12] : &:r914_10, r914_11
5776+
#-----| Goto -> Block 2
5777+
5778+
# 914| Block 4
5779+
# 914| r914_13(bool) = Constant[1] :
5780+
# 914| v914_14(void) = ConditionalBranch : r914_13
5781+
#-----| False -> Block 1
5782+
#-----| True -> Block 3
5783+
5784+
# 915| Block 5
57585785
# 915| r915_4(glval<int>) = VariableAddress[#temp915:11] :
57595786
# 915| r915_5(int) = Load[#temp915:11] : &:r915_4, ~m?
57605787
# 915| mu915_6(int) = Store[b] : &:r915_1, r915_5
@@ -5763,19 +5790,19 @@ ir.cpp:
57635790
# 913| v913_7(void) = AliasedUse : ~m?
57645791
# 913| v913_8(void) = ExitFunction :
57655792

5766-
# 915| Block 2
5793+
# 915| Block 6
57675794
# 915| r915_7(glval<int>) = VariableAddress[x] :
57685795
# 915| r915_8(int) = Load[x] : &:r915_7, ~m?
57695796
# 915| r915_9(glval<int>) = VariableAddress[#temp915:11] :
57705797
# 915| mu915_10(int) = Store[#temp915:11] : &:r915_9, r915_8
5771-
#-----| Goto -> Block 1
5798+
#-----| Goto -> Block 5
57725799

5773-
# 915| Block 3
5800+
# 915| Block 7
57745801
# 915| r915_11(glval<int>) = VariableAddress[x] :
57755802
# 915| r915_12(int) = Load[x] : &:r915_11, ~m?
57765803
# 915| r915_13(glval<int>) = VariableAddress[#temp915:11] :
57775804
# 915| mu915_14(int) = Store[#temp915:11] : &:r915_13, r915_12
5778-
#-----| Goto -> Block 1
5805+
#-----| Goto -> Block 5
57795806

57805807
# 949| void OperatorNew()
57815808
# 949| Block 0
@@ -7266,11 +7293,13 @@ ir.cpp:
72667293
# 1215| r1215_4(glval<__attribute((vector_size(16UL))) int>) = VariableAddress[vi4] :
72677294
# 1215| r1215_5(__attribute((vector_size(16UL))) int) = Load[vi4] : &:r1215_4, ~m?
72687295
# 1215| r1215_6(int) = Constant[3] :
7269-
# 1215| r1215_7(int) = Constant[2] :
7270-
# 1215| r1215_8(int) = Constant[1] :
7271-
# 1215| r1215_9(int) = Constant[0] :
7272-
# 1215| r1215_10(__attribute((vector_size(16))) int) = BuiltIn[__builtin_shufflevector] : 0:r1215_3, 1:r1215_5, 2:r1215_6, 3:r1215_7, 4:r1215_8, 5:r1215_9
7273-
# 1215| mu1215_11(__attribute((vector_size(16UL))) int) = Store[vi4_shuffle] : &:r1215_1, r1215_10
7296+
# 1215| r1215_7(int) = Constant[0] :
7297+
# 1215| r1215_8(int) = Add : r1215_6, r1215_7
7298+
# 1215| r1215_9(int) = Constant[2] :
7299+
# 1215| r1215_10(int) = Constant[1] :
7300+
# 1215| r1215_11(int) = Constant[0] :
7301+
# 1215| r1215_12(__attribute((vector_size(16))) int) = BuiltIn[__builtin_shufflevector] : 0:r1215_3, 1:r1215_5, 2:r1215_8, 3:r1215_9, 4:r1215_10, 5:r1215_11
7302+
# 1215| mu1215_13(__attribute((vector_size(16UL))) int) = Store[vi4_shuffle] : &:r1215_1, r1215_12
72747303
# 1216| r1216_1(glval<__attribute((vector_size(16UL))) int>) = VariableAddress[vi4] :
72757304
# 1216| r1216_2(__attribute((vector_size(16UL))) int) = Load[vi4] : &:r1216_1, ~m?
72767305
# 1216| r1216_3(glval<__attribute((vector_size(16UL))) int>) = VariableAddress[vi4_shuffle] :
@@ -13983,8 +14012,10 @@ ir.cpp:
1398314012
# 2381| mu2381_2(unknown) = AliasedDefinition :
1398414013
# 2381| mu2381_3(unknown) = InitializeNonLocal :
1398514014
# 2382| r2382_1(glval<int>) = VariableAddress[#return] :
13986-
# 2382| r2382_2(int) = Constant[2] :
13987-
# 2382| mu2382_3(int) = Store[#return] : &:r2382_1, r2382_2
14015+
# 2382| r2382_2(int) = Constant[1] :
14016+
# 2382| r2382_3(int) = Constant[1] :
14017+
# 2382| r2382_4(int) = Add : r2382_2, r2382_3
14018+
# 2382| mu2382_5(int) = Store[#return] : &:r2382_1, r2382_4
1398814019
# 2381| r2381_4(glval<int>) = VariableAddress[#return] :
1398914020
# 2381| v2381_5(void) = ReturnValue : &:r2381_4, ~m?
1399014021
# 2381| v2381_6(void) = AliasedUse : ~m?

0 commit comments

Comments
 (0)