Skip to content

Commit 2794676

Browse files
author
Dave Bartolomeo
committed
C++: Make test functions return void 
1 parent 8120879 commit 2794676

File tree

2 files changed

+58
-66
lines changed

2 files changed

+58
-66
lines changed

‎cpp/ql/test/library-tests/valuenumbering/GlobalValueNumbering/ir_gvn.expected

Lines changed: 54 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,78 @@
11
test.cpp:
2-
# 1| int test00(int, int)
2+
# 1| void test00(int, int)
33
# 1| Block 0
4-
# 1| v1_1(void) = EnterFunction :
5-
# 1| m1_2(unknown) = AliasedDefinition :
4+
# 1| v1_1(void) = EnterFunction :
5+
# 1| m1_2(unknown) = AliasedDefinition :
66
# 1| valnum = unique
7-
# 1| m1_3(unknown) = InitializeNonLocal :
7+
# 1| m1_3(unknown) = InitializeNonLocal :
88
# 1| valnum = unique
9-
# 1| m1_4(unknown) = Chi : total:m1_2, partial:m1_3
9+
# 1| m1_4(unknown) = Chi : total:m1_2, partial:m1_3
1010
# 1| valnum = unique
11-
# 1| mu1_5(unknown) = UnmodeledDefinition :
11+
# 1| mu1_5(unknown) = UnmodeledDefinition :
1212
# 1| valnum = unique
13-
# 1| r1_6(glval<int>) = VariableAddress[p0] :
13+
# 1| r1_6(glval<int>) = VariableAddress[p0] :
1414
# 1| valnum = r1_6, r5_1, r6_1
15-
# 1| m1_7(int) = InitializeParameter[p0] : &:r1_6
15+
# 1| m1_7(int) = InitializeParameter[p0] : &:r1_6
1616
# 1| valnum = m1_7, r5_2, r6_2
17-
# 1| r1_8(glval<int>) = VariableAddress[p1] :
17+
# 1| r1_8(glval<int>) = VariableAddress[p1] :
1818
# 1| valnum = r1_8, r5_3, r6_3
19-
# 1| m1_9(int) = InitializeParameter[p1] : &:r1_8
19+
# 1| m1_9(int) = InitializeParameter[p1] : &:r1_8
2020
# 1| valnum = m1_9, r5_4, r6_4
21-
# 2| r2_1(glval<int>) = VariableAddress[x] :
21+
# 2| r2_1(glval<int>) = VariableAddress[x] :
2222
# 2| valnum = r2_1, r5_6, r6_6, r7_1
23-
# 2| m2_2(int) = Uninitialized[x] : &:r2_1
23+
# 2| m2_2(int) = Uninitialized[x] : &:r2_1
2424
# 2| valnum = unique
25-
# 2| r2_3(glval<int>) = VariableAddress[y] :
25+
# 2| r2_3(glval<int>) = VariableAddress[y] :
2626
# 2| valnum = r2_3, r7_3
27-
# 2| m2_4(int) = Uninitialized[y] : &:r2_3
27+
# 2| m2_4(int) = Uninitialized[y] : &:r2_3
2828
# 2| valnum = unique
29-
# 3| r3_1(glval<unsigned char>) = VariableAddress[b] :
29+
# 3| r3_1(glval<unsigned char>) = VariableAddress[b] :
3030
# 3| valnum = unique
31-
# 3| m3_2(unsigned char) = Uninitialized[b] : &:r3_1
31+
# 3| m3_2(unsigned char) = Uninitialized[b] : &:r3_1
3232
# 3| valnum = unique
33-
# 5| r5_1(glval<int>) = VariableAddress[p0] :
33+
# 5| r5_1(glval<int>) = VariableAddress[p0] :
3434
# 5| valnum = r1_6, r5_1, r6_1
35-
# 5| r5_2(int) = Load : &:r5_1, m1_7
35+
# 5| r5_2(int) = Load : &:r5_1, m1_7
3636
# 5| valnum = m1_7, r5_2, r6_2
37-
# 5| r5_3(glval<int>) = VariableAddress[p1] :
37+
# 5| r5_3(glval<int>) = VariableAddress[p1] :
3838
# 5| valnum = r1_8, r5_3, r6_3
39-
# 5| r5_4(int) = Load : &:r5_3, m1_9
39+
# 5| r5_4(int) = Load : &:r5_3, m1_9
4040
# 5| valnum = m1_9, r5_4, r6_4
41-
# 5| r5_5(int) = Add : r5_2, r5_4
41+
# 5| r5_5(int) = Add : r5_2, r5_4
4242
# 5| valnum = m5_7, m6_7, m7_4, r5_5, r6_5, r7_2
43-
# 5| r5_6(glval<int>) = VariableAddress[x] :
43+
# 5| r5_6(glval<int>) = VariableAddress[x] :
4444
# 5| valnum = r2_1, r5_6, r6_6, r7_1
45-
# 5| m5_7(int) = Store : &:r5_6, r5_5
45+
# 5| m5_7(int) = Store : &:r5_6, r5_5
4646
# 5| valnum = m5_7, m6_7, m7_4, r5_5, r6_5, r7_2
47-
# 6| r6_1(glval<int>) = VariableAddress[p0] :
47+
# 6| r6_1(glval<int>) = VariableAddress[p0] :
4848
# 6| valnum = r1_6, r5_1, r6_1
49-
# 6| r6_2(int) = Load : &:r6_1, m1_7
49+
# 6| r6_2(int) = Load : &:r6_1, m1_7
5050
# 6| valnum = m1_7, r5_2, r6_2
51-
# 6| r6_3(glval<int>) = VariableAddress[p1] :
51+
# 6| r6_3(glval<int>) = VariableAddress[p1] :
5252
# 6| valnum = r1_8, r5_3, r6_3
53-
# 6| r6_4(int) = Load : &:r6_3, m1_9
53+
# 6| r6_4(int) = Load : &:r6_3, m1_9
5454
# 6| valnum = m1_9, r5_4, r6_4
55-
# 6| r6_5(int) = Add : r6_2, r6_4
55+
# 6| r6_5(int) = Add : r6_2, r6_4
5656
# 6| valnum = m5_7, m6_7, m7_4, r5_5, r6_5, r7_2
57-
# 6| r6_6(glval<int>) = VariableAddress[x] :
57+
# 6| r6_6(glval<int>) = VariableAddress[x] :
5858
# 6| valnum = r2_1, r5_6, r6_6, r7_1
59-
# 6| m6_7(int) = Store : &:r6_6, r6_5
59+
# 6| m6_7(int) = Store : &:r6_6, r6_5
6060
# 6| valnum = m5_7, m6_7, m7_4, r5_5, r6_5, r7_2
61-
# 7| r7_1(glval<int>) = VariableAddress[x] :
61+
# 7| r7_1(glval<int>) = VariableAddress[x] :
6262
# 7| valnum = r2_1, r5_6, r6_6, r7_1
63-
# 7| r7_2(int) = Load : &:r7_1, m6_7
63+
# 7| r7_2(int) = Load : &:r7_1, m6_7
6464
# 7| valnum = m5_7, m6_7, m7_4, r5_5, r6_5, r7_2
65-
# 7| r7_3(glval<int>) = VariableAddress[y] :
65+
# 7| r7_3(glval<int>) = VariableAddress[y] :
6666
# 7| valnum = r2_3, r7_3
67-
# 7| m7_4(int) = Store : &:r7_3, r7_2
67+
# 7| m7_4(int) = Store : &:r7_3, r7_2
6868
# 7| valnum = m5_7, m6_7, m7_4, r5_5, r6_5, r7_2
69-
# 8| v8_1(void) = NoOp :
70-
# 1| r1_10(glval<int>) = VariableAddress[#return] :
71-
# 1| valnum = unique
72-
# 1| v1_11(void) = ReturnValue : &:r1_10
73-
# 1| v1_12(void) = UnmodeledUse : mu*
74-
# 1| v1_13(void) = AliasedUse : m1_3
75-
# 1| v1_14(void) = ExitFunction :
69+
# 8| v8_1(void) = NoOp :
70+
# 1| v1_10(void) = ReturnVoid :
71+
# 1| v1_11(void) = UnmodeledUse : mu*
72+
# 1| v1_12(void) = AliasedUse : m1_3
73+
# 1| v1_13(void) = ExitFunction :
7674

77-
# 12| int test01(int, int)
75+
# 12| void test01(int, int)
7876
# 12| Block 0
7977
# 12| v12_1(void) = EnterFunction :
8078
# 12| m12_2(unknown) = AliasedDefinition :
@@ -154,14 +152,12 @@ test.cpp:
154152
# 18| m18_4(int) = Store : &:r18_3, r18_2
155153
# 18| valnum = m16_10, m17_10, m18_4, r16_8, r17_8, r18_2
156154
# 19| v19_1(void) = NoOp :
157-
# 12| r12_10(glval<int>) = VariableAddress[#return] :
158-
# 12| valnum = unique
159-
# 12| v12_11(void) = ReturnValue : &:r12_10
160-
# 12| v12_12(void) = UnmodeledUse : mu*
161-
# 12| v12_13(void) = AliasedUse : m12_3
162-
# 12| v12_14(void) = ExitFunction :
155+
# 12| v12_10(void) = ReturnVoid :
156+
# 12| v12_11(void) = UnmodeledUse : mu*
157+
# 12| v12_12(void) = AliasedUse : m12_3
158+
# 12| v12_13(void) = ExitFunction :
163159

164-
# 25| int test02(int, int)
160+
# 25| void test02(int, int)
165161
# 25| Block 0
166162
# 25| v25_1(void) = EnterFunction :
167163
# 25| m25_2(unknown) = AliasedDefinition :
@@ -248,14 +244,12 @@ test.cpp:
248244
# 32| m32_4(int) = Store : &:r32_3, r32_2
249245
# 32| valnum = m31_10, m32_4, r31_8, r32_2
250246
# 33| v33_1(void) = NoOp :
251-
# 25| r25_10(glval<int>) = VariableAddress[#return] :
252-
# 25| valnum = unique
253-
# 25| v25_11(void) = ReturnValue : &:r25_10
254-
# 25| v25_12(void) = UnmodeledUse : mu*
255-
# 25| v25_13(void) = AliasedUse : ~m30_4
256-
# 25| v25_14(void) = ExitFunction :
247+
# 25| v25_10(void) = ReturnVoid :
248+
# 25| v25_11(void) = UnmodeledUse : mu*
249+
# 25| v25_12(void) = AliasedUse : ~m30_4
250+
# 25| v25_13(void) = ExitFunction :
257251

258-
# 39| int test03(int, int, int*)
252+
# 39| void test03(int, int, int*)
259253
# 39| Block 0
260254
# 39| v39_1(void) = EnterFunction :
261255
# 39| m39_2(unknown) = AliasedDefinition :
@@ -356,12 +350,10 @@ test.cpp:
356350
# 46| valnum = m43_10, m45_10, m46_4, r43_8, r45_8, r46_2
357351
# 47| v47_1(void) = NoOp :
358352
# 39| v39_14(void) = ReturnIndirection : &:r39_12, m44_6
359-
# 39| r39_15(glval<int>) = VariableAddress[#return] :
360-
# 39| valnum = unique
361-
# 39| v39_16(void) = ReturnValue : &:r39_15
362-
# 39| v39_17(void) = UnmodeledUse : mu*
363-
# 39| v39_18(void) = AliasedUse : m39_3
364-
# 39| v39_19(void) = ExitFunction :
353+
# 39| v39_15(void) = ReturnVoid :
354+
# 39| v39_16(void) = UnmodeledUse : mu*
355+
# 39| v39_17(void) = AliasedUse : m39_3
356+
# 39| v39_18(void) = ExitFunction :
365357

366358
# 49| unsigned int my_strspn(char const*, char const*)
367359
# 49| Block 0

‎cpp/ql/test/library-tests/valuenumbering/GlobalValueNumbering/test.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
int test00(int p0, int p1) {
1+
void test00(int p0, int p1) {
22
int x, y;
33
unsigned char b;
44

@@ -9,7 +9,7 @@ int test00(int p0, int p1) {
99

1010
int global01 = 1;
1111

12-
int test01(int p0, int p1) {
12+
void test01(int p0, int p1) {
1313
int x, y;
1414
unsigned char b;
1515

@@ -22,7 +22,7 @@ int global02 = 2;
2222

2323
void change_global02(); // Just a declaration
2424

25-
int test02(int p0, int p1) {
25+
void test02(int p0, int p1) {
2626
int x, y;
2727
unsigned char b;
2828

@@ -36,7 +36,7 @@ int global03 = 3;
3636

3737
void change_global03(); // Just a declaration
3838

39-
int test03(int p0, int p1, int* p2) {
39+
void test03(int p0, int p1, int* p2) {
4040
int x, y;
4141
unsigned char b;
4242

0 commit comments

Comments
 (0)