Skip to content

Commit c455db9

Browse files
author
Robert Marsh
committed
C++: update test expectations
1 parent c39de75 commit c455db9

File tree

3 files changed

+23
-24
lines changed

3 files changed

+23
-24
lines changed

‎cpp/ql/test/library-tests/rangeanalysis/rangeanalysis/RangeAnalysis.expected‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@
4040
| test.cpp:140:10:140:10 | Store: i | test.cpp:135:16:135:16 | InitializeParameter: x | 0 | false | CompareLT: ... < ... | test.cpp:139:11:139:15 | test.cpp:139:11:139:15 |
4141
| test.cpp:140:10:140:10 | Store: i | test.cpp:138:5:138:5 | Phi: i | 1 | false | NoReason | file://:0:0:0:0 | file://:0:0:0:0 |
4242
| test.cpp:140:10:140:10 | Store: i | test.cpp:138:5:138:5 | Phi: i | 1 | true | NoReason | file://:0:0:0:0 | file://:0:0:0:0 |
43-
| test.cpp:149:10:149:10 | Store: i | file://:0:0:0:0 | 0 | 1 | false | NoReason | file://:0:0:0:0 | file://:0:0:0:0 |
44-
| test.cpp:149:10:149:10 | Store: i | test.cpp:147:5:147:5 | Phi: i | 1 | false | NoReason | file://:0:0:0:0 | file://:0:0:0:0 |
45-
| test.cpp:149:10:149:10 | Store: i | test.cpp:147:5:147:5 | Phi: i | 1 | true | NoReason | file://:0:0:0:0 | file://:0:0:0:0 |
4643
| test.cpp:156:12:156:12 | Load: x | test.cpp:153:23:153:23 | InitializeParameter: y | -1 | false | CompareEQ: ... == ... | test.cpp:155:9:155:16 | test.cpp:155:9:155:16 |
4744
| test.cpp:156:12:156:12 | Load: x | test.cpp:153:23:153:23 | InitializeParameter: y | -1 | true | CompareEQ: ... == ... | test.cpp:155:9:155:16 | test.cpp:155:9:155:16 |
4845
| test.cpp:156:12:156:12 | Load: x | test.cpp:153:23:153:23 | InitializeParameter: y | -1 | true | CompareLT: ... < ... | test.cpp:154:6:154:10 | test.cpp:154:6:154:10 |

‎cpp/ql/test/library-tests/rangeanalysis/signanalysis/SignAnalysis.expected‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@
6565
| test.c:34:5:34:14 | Store: ... += ... | positive |
6666
| test.c:34:14:34:14 | Load: i | positive |
6767
| test.c:36:10:36:14 | Load: total | positive |
68-
| test.c:36:10:36:18 | Add: ... + ... | positive |
69-
| test.c:36:10:36:18 | Store: ... + ... | positive |
70-
| test.c:36:18:36:18 | Load: i | positive |
68+
| test.c:36:10:36:18 | Add: ... + ... | positive strictlyPositive |
69+
| test.c:36:10:36:18 | Store: ... + ... | positive strictlyPositive |
70+
| test.c:36:18:36:18 | Load: i | positive strictlyPositive |
7171
| test.c:42:15:42:15 | Load: i | positive |
7272
| test.c:42:15:42:15 | Phi: i | positive |
7373
| test.c:42:15:42:15 | Phi: i | positive |
@@ -81,9 +81,9 @@
8181
| test.c:43:5:43:14 | Store: ... += ... | positive |
8282
| test.c:43:14:43:14 | Load: i | positive |
8383
| test.c:45:10:45:14 | Load: total | positive |
84-
| test.c:45:10:45:18 | Add: ... + ... | positive |
85-
| test.c:45:10:45:18 | Store: ... + ... | positive |
86-
| test.c:45:18:45:18 | Load: i | positive |
84+
| test.c:45:10:45:18 | Add: ... + ... | positive strictlyPositive |
85+
| test.c:45:10:45:18 | Store: ... + ... | positive strictlyPositive |
86+
| test.c:45:18:45:18 | Load: i | positive strictlyPositive |
8787
| test.c:51:15:51:15 | Load: i | positive |
8888
| test.c:51:15:51:15 | Phi: i | positive |
8989
| test.c:51:15:51:15 | Phi: i | positive |
@@ -448,10 +448,10 @@
448448
| test.c:343:5:343:7 | Constant: ... ++ | positive strictlyPositive |
449449
| test.c:343:5:343:7 | Load: ... ++ | positive |
450450
| test.c:343:5:343:7 | Store: ... ++ | positive strictlyPositive |
451-
| test.c:345:3:345:7 | Store: ... = ... | positive |
452-
| test.c:345:7:345:7 | Load: i | positive |
451+
| test.c:345:3:345:7 | Store: ... = ... | positive strictlyPositive |
452+
| test.c:345:7:345:7 | Load: i | positive strictlyPositive |
453453
| test.c:346:7:346:7 | Load: x | positive |
454-
| test.c:347:9:347:9 | Load: d | positive |
454+
| test.c:347:9:347:9 | Load: d | positive strictlyPositive |
455455
| test.c:348:14:348:14 | Constant: 1 | positive strictlyPositive |
456456
| test.c:348:14:348:14 | Store: 1 | positive strictlyPositive |
457457
| test.c:355:42:355:42 | InitializeParameter: x | positive |
@@ -674,6 +674,8 @@
674674
| test.cpp:45:12:45:15 | Constant: 1024 | positive strictlyPositive |
675675
| test.cpp:46:5:46:12 | Store: ... = ... | positive strictlyPositive |
676676
| test.cpp:46:9:46:12 | Constant: 1024 | positive strictlyPositive |
677+
| test.cpp:57:21:57:21 | Load: x | positive strictlyPositive |
678+
| test.cpp:62:21:62:21 | Load: x | negative strictlyNegative |
677679
| test.cpp:69:10:69:21 | Constant: ... \|\| ... | positive strictlyPositive |
678680
| test.cpp:69:10:69:21 | Load: ... \|\| ... | positive |
679681
| test.cpp:69:10:69:21 | Phi: ... \|\| ... | positive |

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ test.cpp:
365365

366366
# 53| Block 1
367367
# 53| m1_0(unsigned int) = Phi : from 0:m0_11, from 8:m8_4
368-
# 53| valnum = unique
368+
# 53| valnum = m1_0
369369
# 53| r1_1(glval<char *>) = VariableAddress[str] :
370370
# 53| valnum = r0_3
371371
# 53| r1_2(char *) = Load : r1_1, m0_4
@@ -395,11 +395,11 @@ test.cpp:
395395

396396
# 56| Block 3
397397
# 56| m3_0(char *) = Phi : from 2:m2_3, from 5:m5_4
398-
# 56| valnum = unique
398+
# 56| valnum = m3_0
399399
# 56| r3_1(glval<char *>) = VariableAddress[ptr] :
400400
# 56| valnum = r0_7
401401
# 56| r3_2(char *) = Load : r3_1, m3_0
402-
# 56| valnum = unique
402+
# 56| valnum = m3_0
403403
# 56| r3_3(char) = Load : r3_2, m0_1
404404
# 56| valnum = unique
405405
# 56| r3_4(int) = Convert : r3_3
@@ -422,7 +422,7 @@ test.cpp:
422422
# 56| r4_0(glval<char *>) = VariableAddress[ptr] :
423423
# 56| valnum = r0_7
424424
# 56| r4_1(char *) = Load : r4_0, m3_0
425-
# 56| valnum = unique
425+
# 56| valnum = m3_0
426426
# 56| r4_2(char) = Load : r4_1, m0_1
427427
# 56| valnum = unique
428428
# 56| r4_3(int) = Convert : r4_2
@@ -439,7 +439,7 @@ test.cpp:
439439
# 56| r5_0(glval<char *>) = VariableAddress[ptr] :
440440
# 56| valnum = r0_7
441441
# 56| r5_1(char *) = Load : r5_0, m3_0
442-
# 56| valnum = unique
442+
# 56| valnum = m3_0
443443
# 56| r5_2(int) = Constant[1] :
444444
# 56| valnum = unique
445445
# 56| r5_3(char *) = PointerAdd[1] : r5_1, r5_2
@@ -452,7 +452,7 @@ test.cpp:
452452
# 59| r6_0(glval<char *>) = VariableAddress[ptr] :
453453
# 59| valnum = r0_7
454454
# 59| r6_1(char *) = Load : r6_0, m3_0
455-
# 59| valnum = unique
455+
# 59| valnum = m3_0
456456
# 59| r6_2(char) = Load : r6_1, m0_1
457457
# 59| valnum = unique
458458
# 59| r6_3(int) = Convert : r6_2
@@ -473,7 +473,7 @@ test.cpp:
473473
# 62| r8_0(glval<unsigned int>) = VariableAddress[result] :
474474
# 62| valnum = r0_9
475475
# 62| r8_1(unsigned int) = Load : r8_0, m1_0
476-
# 62| valnum = unique
476+
# 62| valnum = m1_0
477477
# 62| r8_2(unsigned int) = Constant[1] :
478478
# 62| valnum = unique
479479
# 62| r8_3(unsigned int) = Add : r8_1, r8_2
@@ -489,9 +489,9 @@ test.cpp:
489489
# 65| r9_2(glval<unsigned int>) = VariableAddress[result] :
490490
# 65| valnum = r0_9
491491
# 65| r9_3(unsigned int) = Load : r9_2, m1_0
492-
# 65| valnum = r9_3
492+
# 65| valnum = m1_0
493493
# 65| m9_4(unsigned int) = Store : r9_1, r9_3
494-
# 65| valnum = r9_3
494+
# 65| valnum = m1_0
495495
# 49| r9_5(glval<unsigned int>) = VariableAddress[#return] :
496496
# 49| valnum = r9_1
497497
# 49| v9_6(void) = ReturnValue : r9_5, m9_4
@@ -639,15 +639,15 @@ test.cpp:
639639

640640
# 88| Block 3
641641
# 88| m3_0(int) = Phi : from 1:m1_3, from 2:m2_3
642-
# 88| valnum = unique
642+
# 88| valnum = m3_0
643643
# 88| r3_1(glval<int>) = VariableAddress[#temp88:7] :
644644
# 88| valnum = r1_2
645645
# 88| r3_2(int) = Load : r3_1, m3_0
646-
# 88| valnum = r3_2
646+
# 88| valnum = m3_0
647647
# 88| r3_3(glval<int>) = VariableAddress[v] :
648648
# 88| valnum = r0_9
649649
# 88| m3_4(int) = Store : r3_3, r3_2
650-
# 88| valnum = r3_2
650+
# 88| valnum = m3_0
651651
# 89| v3_5(void) = NoOp :
652652
# 84| v3_6(void) = ReturnVoid :
653653
# 84| v3_7(void) = UnmodeledUse : mu*

0 commit comments

Comments
 (0)