Skip to content

Commit 2e3d349

Browse files
MathiasVPMathiasVP
committed
C++: Accept test changes.
1 parent 5acd2bb commit 2e3d349

10 files changed

+24
-587
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3319,7 +3319,7 @@ ir.c:
33193319
# 86| Block 2
33203320
# 86| r86_1(glval<int>) = VariableAddress[x1] :
33213321
# 86| r86_2(int) = Load[x1] : &:r86_1, m84_6
3322-
# 86| r86_3(int) = LogicalNot : r86_2
3322+
# 86| r86_3(bool) = LogicalNot : r86_2
33233323
# 86| v86_4(void) = ConditionalBranch : r86_3
33243324
#-----| False -> Block 4
33253325
#-----| True -> Block 3
@@ -3332,7 +3332,7 @@ ir.c:
33323332
# 88| r88_1(glval<int>) = VariableAddress[y] :
33333333
# 88| r88_2(glval<int>) = VariableAddress[x1] :
33343334
# 88| r88_3(int) = Load[x1] : &:r88_2, m84_6
3335-
# 88| r88_4(int) = LogicalNot : r88_3
3335+
# 88| r88_4(bool) = LogicalNot : r88_3
33363336
# 88| m88_5(int) = Store[y] : &:r88_1, r88_4
33373337
# 89| r89_1(glval<int>) = VariableAddress[y] :
33383338
# 89| r89_2(int) = Load[y] : &:r89_1, m88_5
@@ -3347,7 +3347,7 @@ ir.c:
33473347
# 90| Block 6
33483348
# 90| r90_1(glval<int>) = VariableAddress[y] :
33493349
# 90| r90_2(int) = Load[y] : &:r90_1, m88_5
3350-
# 90| r90_3(int) = LogicalNot : r90_2
3350+
# 90| r90_3(bool) = LogicalNot : r90_2
33513351
# 90| v90_4(void) = ConditionalBranch : r90_3
33523352
#-----| False -> Block 8
33533353
#-----| True -> Block 7
@@ -3377,7 +3377,7 @@ ir.c:
33773377
# 93| Block 11
33783378
# 93| r93_1(glval<int>) = VariableAddress[x1] :
33793379
# 93| r93_2(int) = Load[x1] : &:r93_1, m84_6
3380-
# 93| r93_3(int) = LogicalNot : r93_2
3380+
# 93| r93_3(bool) = LogicalNot : r93_2
33813381
# 93| v93_4(void) = ConditionalBranch : r93_3
33823382
#-----| False -> Block 14
33833383
#-----| True -> Block 12
@@ -3403,7 +3403,7 @@ ir.c:
34033403
# 94| Block 15
34043404
# 94| r94_4(glval<int>) = VariableAddress[x2] :
34053405
# 94| r94_5(int) = Load[x2] : &:r94_4, m84_8
3406-
# 94| r94_6(int) = LogicalNot : r94_5
3406+
# 94| r94_6(bool) = LogicalNot : r94_5
34073407
# 94| v94_7(void) = ConditionalBranch : r94_6
34083408
#-----| False -> Block 17
34093409
#-----| True -> Block 16
@@ -3415,15 +3415,15 @@ ir.c:
34153415
# 95| Block 17
34163416
# 95| r95_1(glval<int>) = VariableAddress[x1] :
34173417
# 95| r95_2(int) = Load[x1] : &:r95_1, m84_6
3418-
# 95| r95_3(int) = LogicalNot : r95_2
3418+
# 95| r95_3(bool) = LogicalNot : r95_2
34193419
# 95| v95_4(void) = ConditionalBranch : r95_3
34203420
#-----| False -> Block 20
34213421
#-----| True -> Block 18
34223422

34233423
# 95| Block 18
34243424
# 95| r95_5(glval<int>) = VariableAddress[x2] :
34253425
# 95| r95_6(int) = Load[x2] : &:r95_5, m84_8
3426-
# 95| r95_7(int) = LogicalNot : r95_6
3426+
# 95| r95_7(bool) = LogicalNot : r95_6
34273427
# 95| v95_8(void) = ConditionalBranch : r95_7
34283428
#-----| False -> Block 20
34293429
#-----| True -> Block 19
@@ -3453,7 +3453,7 @@ ir.c:
34533453
# 97| Block 23
34543454
# 97| r97_1(glval<int>) = VariableAddress[x1] :
34553455
# 97| r97_2(int) = Load[x1] : &:r97_1, m84_6
3456-
# 97| r97_3(int) = LogicalNot : r97_2
3456+
# 97| r97_3(bool) = LogicalNot : r97_2
34573457
# 97| v97_4(void) = ConditionalBranch : r97_3
34583458
#-----| False -> Block 24
34593459
#-----| True -> Block 25
@@ -3479,7 +3479,7 @@ ir.c:
34793479
# 98| Block 27
34803480
# 98| r98_4(glval<int>) = VariableAddress[x2] :
34813481
# 98| r98_5(int) = Load[x2] : &:r98_4, m84_8
3482-
# 98| r98_6(int) = LogicalNot : r98_5
3482+
# 98| r98_6(bool) = LogicalNot : r98_5
34833483
# 98| v98_7(void) = ConditionalBranch : r98_6
34843484
#-----| False -> Block 29
34853485
#-----| True -> Block 28
@@ -3491,15 +3491,15 @@ ir.c:
34913491
# 99| Block 29
34923492
# 99| r99_1(glval<int>) = VariableAddress[x1] :
34933493
# 99| r99_2(int) = Load[x1] : &:r99_1, m84_6
3494-
# 99| r99_3(int) = LogicalNot : r99_2
3494+
# 99| r99_3(bool) = LogicalNot : r99_2
34953495
# 99| v99_4(void) = ConditionalBranch : r99_3
34963496
#-----| False -> Block 30
34973497
#-----| True -> Block 31
34983498

34993499
# 99| Block 30
35003500
# 99| r99_5(glval<int>) = VariableAddress[x2] :
35013501
# 99| r99_6(int) = Load[x2] : &:r99_5, m84_8
3502-
# 99| r99_7(int) = LogicalNot : r99_6
3502+
# 99| r99_7(bool) = LogicalNot : r99_6
35033503
# 99| v99_8(void) = ConditionalBranch : r99_7
35043504
#-----| False -> Block 32
35053505
#-----| True -> Block 31
@@ -3553,7 +3553,7 @@ ir.c:
35533553
# 103| Block 38
35543554
# 103| r103_1(glval<int>) = VariableAddress[x_1_and_2] :
35553555
# 103| r103_2(int) = Load[x_1_and_2] : &:r103_1, m101_11
3556-
# 103| r103_3(int) = LogicalNot : r103_2
3556+
# 103| r103_3(bool) = LogicalNot : r103_2
35573557
# 103| v103_4(void) = ConditionalBranch : r103_3
35583558
#-----| False -> Block 40
35593559
#-----| True -> Block 39

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,40 +31,29 @@ thisArgumentIsNonPointer
3131
nonUniqueIRVariable
3232
nonBooleanOperand
3333
| ir.c:85:7:85:8 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
34-
| ir.c:86:6:86:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
3534
| ir.c:86:6:86:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
3635
| ir.c:88:11:88:13 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
3736
| ir.c:89:6:89:6 | ConditionalBranch: y | Conditional branch instruction ConditionalBranch: y with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
38-
| ir.c:90:6:90:7 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
3937
| ir.c:90:6:90:7 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
4038
| ir.c:92:6:92:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
4139
| ir.c:92:12:92:13 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
42-
| ir.c:93:6:93:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
4340
| ir.c:93:6:93:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
4441
| ir.c:93:13:93:14 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
4542
| ir.c:94:6:94:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
46-
| ir.c:94:12:94:14 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
4743
| ir.c:94:12:94:14 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
48-
| ir.c:95:6:95:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
4944
| ir.c:95:6:95:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
50-
| ir.c:95:13:95:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
5145
| ir.c:95:13:95:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
5246
| ir.c:96:6:96:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
5347
| ir.c:96:12:96:13 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
54-
| ir.c:97:6:97:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
5548
| ir.c:97:6:97:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
5649
| ir.c:97:13:97:14 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
5750
| ir.c:98:6:98:7 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
58-
| ir.c:98:12:98:14 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
5951
| ir.c:98:12:98:14 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
60-
| ir.c:99:6:99:8 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
6152
| ir.c:99:6:99:8 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
62-
| ir.c:99:13:99:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
6353
| ir.c:99:13:99:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
6454
| ir.c:101:19:101:20 | ConditionalBranch: x1 | Conditional branch instruction ConditionalBranch: x1 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
6555
| ir.c:101:25:101:26 | ConditionalBranch: x2 | Conditional branch instruction ConditionalBranch: x2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
6656
| ir.c:102:6:102:14 | ConditionalBranch: x_1_and_2 | Conditional branch instruction ConditionalBranch: x_1_and_2 with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
67-
| ir.c:103:6:103:15 | ConditionalBranch: ! ... | Conditional branch instruction ConditionalBranch: ! ... with non-Boolean condition, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
6857
| ir.c:103:6:103:15 | LogicalNot: ! ... | Logical Not instruction LogicalNot: ! ... with non-Boolean operand, in function '$@'. | ir.c:84:6:84:28 | void branch_on_integral_in_c(int, int) | void branch_on_integral_in_c(int, int) |
6958
| try_except.c:35:13:35:13 | ConditionalBranch: b | Conditional branch instruction ConditionalBranch: b with non-Boolean condition, in function '$@'. | try_except.c:32:6:32:6 | void h(int) | void h(int) |
7059
missingCppType

0 commit comments

Comments
 (0)