Skip to content

Commit d010b6e

Browse files
committed
C++: Update expected test results
1 parent 2908570 commit d010b6e

File tree

3 files changed

+32
-20
lines changed

3 files changed

+32
-20
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ void test_aggregate_literal() {
4242
void test_postfix_crement(int *p, int q) {
4343
p++; // $ asExpr="... ++" asIndirectExpr="... ++" asExpr=p asIndirectExpr=p
4444
q++; // $ asExpr="... ++" asExpr=q
45-
(p++); // $ numberOfNodes="... ++: 2" numberOfIndirectNodes="... ++: 2" asExpr="... ++" asIndirectExpr="... ++" MISSING: asExpr=p asIndirectExpr=p
46-
(q++); // $ numberOfNodes="... ++: 2" asExpr="... ++" MISSING: asExpr=q
47-
(void)(p++); // $ numberOfNodes="... ++: 2" asExpr="... ++" numberOfIndirectNodes="... ++: 2" asIndirectExpr="... ++" MISSING: asExpr=p asIndirectExpr=p
48-
(void)(q++); // $ numberOfNodes="... ++: 2" asExpr="... ++" MISSING: asExpr=q
49-
(void)p++; // $ asExpr="... ++" asIndirectExpr="... ++" asExpr=p asIndirectExpr=p
50-
(void)q++; // $ asExpr="... ++" asExpr=q
45+
(p++); // $ numberOfNodes="... ++: 2" numberOfIndirectNodes="... ++: 2" asExpr="... ++" asIndirectExpr="... ++"
46+
(q++); // $ numberOfNodes="... ++: 2" asExpr="... ++"
47+
(void)(p++); // $ asExpr="p(... ++)" asIndirectExpr="p(*... ++)"
48+
(void)(q++); // $ asExpr="q(... ++)"
49+
(void)p++; // $ asExpr="p(... ++)" asIndirectExpr="p(*... ++)"
50+
(void)q++; // $ asExpr="q(... ++)"
5151
int *p1 = p++; // $ asExpr="... ++" asIndirectExpr="... ++" asExpr="p(... ++)" asIndirectExpr="p(*... ++)"
5252
int q1 = q++; // $ asExpr="... ++" asExpr="q(... ++)"
53-
(int*)(p++); // $ numberOfIndirectNodes="... ++: 2" asExpr="... ++" asIndirectExpr="... ++" MISSING: asExpr="p(... ++)" asIndirectExpr="p(*... ++)"
54-
(int)(q++); // $ asExpr="... ++" MISSING: asExpr="q(... ++)"
53+
(int*)(p++); // $ asExpr="... ++" asIndirectExpr="... ++" asExpr="p(... ++)" asIndirectExpr="p(*... ++)"
54+
(int)(q++); // $ asExpr="... ++" asExpr="q(... ++)"
5555
int *p2 = (int*)(p++); // $ asExpr="... ++" asIndirectExpr="... ++" asExpr="p(... ++)" asIndirectExpr="p(*... ++)"
5656
int q2 = (int)(q++); // $ asExpr="... ++" asExpr="q(... ++)"
5757
}

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20194,25 +20194,29 @@ ir.cpp:
2019420194
# 2733| r2733_3(int) = Constant[1] :
2019520195
# 2733| r2733_4(int *) = PointerAdd[4] : r2733_2, r2733_3
2019620196
# 2733| m2733_5(int *) = Store[p] : &:r2733_1, r2733_4
20197-
# 2733| v2733_6(void) = Convert : r2733_2
20197+
# 2733| r2733_6(int *) = CopyValue : r2733_2
20198+
# 2733| v2733_7(void) = Convert : r2733_6
2019820199
# 2734| r2734_1(glval<int>) = VariableAddress[q] :
2019920200
# 2734| r2734_2(int) = Load[q] : &:r2734_1, m2732_5
2020020201
# 2734| r2734_3(int) = Constant[1] :
2020120202
# 2734| r2734_4(int) = Add : r2734_2, r2734_3
2020220203
# 2734| m2734_5(int) = Store[q] : &:r2734_1, r2734_4
20203-
# 2734| v2734_6(void) = Convert : r2734_2
20204+
# 2734| r2734_6(int) = CopyValue : r2734_2
20205+
# 2734| v2734_7(void) = Convert : r2734_6
2020420206
# 2735| r2735_1(glval<int *>) = VariableAddress[p] :
2020520207
# 2735| r2735_2(int *) = Load[p] : &:r2735_1, m2733_5
2020620208
# 2735| r2735_3(int) = Constant[1] :
2020720209
# 2735| r2735_4(int *) = PointerAdd[4] : r2735_2, r2735_3
2020820210
# 2735| m2735_5(int *) = Store[p] : &:r2735_1, r2735_4
20209-
# 2735| v2735_6(void) = Convert : r2735_2
20211+
# 2735| r2735_6(int *) = CopyValue : r2735_2
20212+
# 2735| v2735_7(void) = Convert : r2735_6
2021020213
# 2736| r2736_1(glval<int>) = VariableAddress[q] :
2021120214
# 2736| r2736_2(int) = Load[q] : &:r2736_1, m2734_5
2021220215
# 2736| r2736_3(int) = Constant[1] :
2021320216
# 2736| r2736_4(int) = Add : r2736_2, r2736_3
2021420217
# 2736| m2736_5(int) = Store[q] : &:r2736_1, r2736_4
20215-
# 2736| v2736_6(void) = Convert : r2736_2
20218+
# 2736| r2736_6(int) = CopyValue : r2736_2
20219+
# 2736| v2736_7(void) = Convert : r2736_6
2021620220
# 2737| r2737_1(glval<int *>) = VariableAddress[p1] :
2021720221
# 2737| r2737_2(glval<int *>) = VariableAddress[p] :
2021820222
# 2737| r2737_3(int *) = Load[p] : &:r2737_2, m2735_5
@@ -20234,13 +20238,15 @@ ir.cpp:
2023420238
# 2739| r2739_3(int) = Constant[1] :
2023520239
# 2739| r2739_4(int *) = PointerAdd[4] : r2739_2, r2739_3
2023620240
# 2739| m2739_5(int *) = Store[p] : &:r2739_1, r2739_4
20237-
# 2739| r2739_6(int *) = Convert : r2739_2
20241+
# 2739| r2739_6(int *) = CopyValue : r2739_2
20242+
# 2739| r2739_7(int *) = Convert : r2739_6
2023820243
# 2740| r2740_1(glval<int>) = VariableAddress[q] :
2023920244
# 2740| r2740_2(int) = Load[q] : &:r2740_1, m2738_6
2024020245
# 2740| r2740_3(int) = Constant[1] :
2024120246
# 2740| r2740_4(int) = Add : r2740_2, r2740_3
2024220247
# 2740| m2740_5(int) = Store[q] : &:r2740_1, r2740_4
20243-
# 2740| r2740_6(int) = Convert : r2740_2
20248+
# 2740| r2740_6(int) = CopyValue : r2740_2
20249+
# 2740| r2740_7(int) = Convert : r2740_6
2024420250
# 2741| r2741_1(glval<int *>) = VariableAddress[p2] :
2024520251
# 2741| r2741_2(glval<int *>) = VariableAddress[p] :
2024620252
# 2741| r2741_3(int *) = Load[p] : &:r2741_2, m2739_5

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18353,25 +18353,29 @@ ir.cpp:
1835318353
# 2733| r2733_3(int) = Constant[1] :
1835418354
# 2733| r2733_4(int *) = PointerAdd[4] : r2733_2, r2733_3
1835518355
# 2733| mu2733_5(int *) = Store[p] : &:r2733_1, r2733_4
18356-
# 2733| v2733_6(void) = Convert : r2733_2
18356+
# 2733| r2733_6(int *) = CopyValue : r2733_2
18357+
# 2733| v2733_7(void) = Convert : r2733_6
1835718358
# 2734| r2734_1(glval<int>) = VariableAddress[q] :
1835818359
# 2734| r2734_2(int) = Load[q] : &:r2734_1, ~m?
1835918360
# 2734| r2734_3(int) = Constant[1] :
1836018361
# 2734| r2734_4(int) = Add : r2734_2, r2734_3
1836118362
# 2734| mu2734_5(int) = Store[q] : &:r2734_1, r2734_4
18362-
# 2734| v2734_6(void) = Convert : r2734_2
18363+
# 2734| r2734_6(int) = CopyValue : r2734_2
18364+
# 2734| v2734_7(void) = Convert : r2734_6
1836318365
# 2735| r2735_1(glval<int *>) = VariableAddress[p] :
1836418366
# 2735| r2735_2(int *) = Load[p] : &:r2735_1, ~m?
1836518367
# 2735| r2735_3(int) = Constant[1] :
1836618368
# 2735| r2735_4(int *) = PointerAdd[4] : r2735_2, r2735_3
1836718369
# 2735| mu2735_5(int *) = Store[p] : &:r2735_1, r2735_4
18368-
# 2735| v2735_6(void) = Convert : r2735_2
18370+
# 2735| r2735_6(int *) = CopyValue : r2735_2
18371+
# 2735| v2735_7(void) = Convert : r2735_6
1836918372
# 2736| r2736_1(glval<int>) = VariableAddress[q] :
1837018373
# 2736| r2736_2(int) = Load[q] : &:r2736_1, ~m?
1837118374
# 2736| r2736_3(int) = Constant[1] :
1837218375
# 2736| r2736_4(int) = Add : r2736_2, r2736_3
1837318376
# 2736| mu2736_5(int) = Store[q] : &:r2736_1, r2736_4
18374-
# 2736| v2736_6(void) = Convert : r2736_2
18377+
# 2736| r2736_6(int) = CopyValue : r2736_2
18378+
# 2736| v2736_7(void) = Convert : r2736_6
1837518379
# 2737| r2737_1(glval<int *>) = VariableAddress[p1] :
1837618380
# 2737| r2737_2(glval<int *>) = VariableAddress[p] :
1837718381
# 2737| r2737_3(int *) = Load[p] : &:r2737_2, ~m?
@@ -18393,13 +18397,15 @@ ir.cpp:
1839318397
# 2739| r2739_3(int) = Constant[1] :
1839418398
# 2739| r2739_4(int *) = PointerAdd[4] : r2739_2, r2739_3
1839518399
# 2739| mu2739_5(int *) = Store[p] : &:r2739_1, r2739_4
18396-
# 2739| r2739_6(int *) = Convert : r2739_2
18400+
# 2739| r2739_6(int *) = CopyValue : r2739_2
18401+
# 2739| r2739_7(int *) = Convert : r2739_6
1839718402
# 2740| r2740_1(glval<int>) = VariableAddress[q] :
1839818403
# 2740| r2740_2(int) = Load[q] : &:r2740_1, ~m?
1839918404
# 2740| r2740_3(int) = Constant[1] :
1840018405
# 2740| r2740_4(int) = Add : r2740_2, r2740_3
1840118406
# 2740| mu2740_5(int) = Store[q] : &:r2740_1, r2740_4
18402-
# 2740| r2740_6(int) = Convert : r2740_2
18407+
# 2740| r2740_6(int) = CopyValue : r2740_2
18408+
# 2740| r2740_7(int) = Convert : r2740_6
1840318409
# 2741| r2741_1(glval<int *>) = VariableAddress[p2] :
1840418410
# 2741| r2741_2(glval<int *>) = VariableAddress[p] :
1840518411
# 2741| r2741_3(int *) = Load[p] : &:r2741_2, ~m?

0 commit comments

Comments
 (0)