Skip to content

Commit cf025e1

Browse files
MathiasVPMathiasVP
committed
C++: Accept test changes.
1 parent a200ced commit cf025e1

File tree

2 files changed

+30
-37
lines changed

2 files changed

+30
-37
lines changed

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

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17982,7 +17982,6 @@ ir.cpp:
1798217982
# 2504| m2504_6(unknown) = Chi : total:m2501_4, partial:m2504_5
1798317983
# 2504| m2504_7(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2504_1
1798417984
# 2504| m2504_8(ClassWithDestructor) = Chi : total:m2504_2, partial:m2504_7
17985-
# 2505| v2505_1(void) = NoOp :
1798617985
# 2506| r2506_1(glval<ClassWithDestructor>) = VariableAddress[x] :
1798717986
# 2506| r2506_2(glval<unknown>) = FunctionAddress[~ClassWithDestructor] :
1798817987
# 2506| v2506_3(void) = Call[~ClassWithDestructor] : func:r2506_2, this:r2506_1
@@ -17991,18 +17990,11 @@ ir.cpp:
1799117990
# 2506| v2506_6(void) = ^IndirectReadSideEffect[-1] : &:r2506_1, m2504_8
1799217991
# 2506| m2506_7(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2506_1
1799317992
# 2506| m2506_8(ClassWithDestructor) = Chi : total:m2504_8, partial:m2506_7
17994-
# 2506| r2506_9(glval<ClassWithDestructor>) = VariableAddress[x] :
17995-
# 2506| r2506_10(glval<unknown>) = FunctionAddress[~ClassWithDestructor] :
17996-
# 2506| v2506_11(void) = Call[~ClassWithDestructor] : func:r2506_10, this:r2506_9
17997-
# 2506| m2506_12(unknown) = ^CallSideEffect : ~m2506_5
17998-
# 2506| m2506_13(unknown) = Chi : total:m2506_5, partial:m2506_12
17999-
# 2506| v2506_14(void) = ^IndirectReadSideEffect[-1] : &:r2506_9, m2506_8
18000-
# 2506| m2506_15(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2506_9
18001-
# 2506| m2506_16(ClassWithDestructor) = Chi : total:m2506_8, partial:m2506_15
17993+
# 2505| v2505_1(void) = NoOp :
1800217994
#-----| Goto -> Block 2
1800317995

1800417996
# 2507| Block 2
18005-
# 2507| m2507_1(unknown) = Phi : from 0:~m2501_4, from 1:~m2506_13
17997+
# 2507| m2507_1(unknown) = Phi : from 0:~m2501_4, from 1:~m2506_5
1800617998
# 2507| v2507_2(void) = NoOp :
1800717999
# 2508| v2508_1(void) = NoOp :
1800818000
# 2501| v2501_7(void) = ReturnVoid :
@@ -18080,7 +18072,6 @@ ir.cpp:
1808018072
# 2524| m2524_6(unknown) = Chi : total:m2522_6, partial:m2524_5
1808118073
# 2524| m2524_7(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2524_1
1808218074
# 2524| m2524_8(ClassWithDestructor) = Chi : total:m2524_2, partial:m2524_7
18083-
# 2525| v2525_1(void) = NoOp :
1808418075
# 2526| r2526_1(glval<ClassWithDestructor>) = VariableAddress[x] :
1808518076
# 2526| r2526_2(glval<unknown>) = FunctionAddress[~ClassWithDestructor] :
1808618077
# 2526| v2526_3(void) = Call[~ClassWithDestructor] : func:r2526_2, this:r2526_1
@@ -18097,24 +18088,20 @@ ir.cpp:
1809718088
# 2530| v2530_6(void) = ^IndirectReadSideEffect[-1] : &:r2530_1, m2522_8
1809818089
# 2530| m2530_7(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2530_1
1809918090
# 2530| m2530_8(ClassWithDestructor) = Chi : total:m2522_8, partial:m2530_7
18100-
# 2526| r2526_9(glval<ClassWithDestructor>) = VariableAddress[x] :
18101-
# 2526| r2526_10(glval<unknown>) = FunctionAddress[~ClassWithDestructor] :
18102-
# 2526| v2526_11(void) = Call[~ClassWithDestructor] : func:r2526_10, this:r2526_9
18103-
# 2526| m2526_12(unknown) = ^CallSideEffect : ~m2530_5
18104-
# 2526| m2526_13(unknown) = Chi : total:m2530_5, partial:m2526_12
18105-
# 2526| v2526_14(void) = ^IndirectReadSideEffect[-1] : &:r2526_9, m2526_8
18106-
# 2526| m2526_15(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2526_9
18107-
# 2526| m2526_16(ClassWithDestructor) = Chi : total:m2526_8, partial:m2526_15
18108-
#-----| Goto -> Block 2
18091+
# 2525| v2525_1(void) = NoOp :
18092+
#-----| Goto -> Block 3
1810918093

1811018094
# 2527| Block 2
18111-
# 2527| m2527_1(unknown) = Phi : from 0:~m2522_6, from 1:~m2526_13
18112-
# 2527| v2527_2(void) = NoOp :
18113-
# 2528| v2528_1(void) = NoOp :
18114-
# 2530| v2530_9(void) = NoOp :
18095+
# 2527| v2527_1(void) = NoOp :
18096+
# 2528| v2528_1(void) = NoOp :
18097+
#-----| Goto -> Block 3
18098+
18099+
# 2530| Block 3
18100+
# 2530| m2530_9(unknown) = Phi : from 1:~m2530_5, from 2:~m2522_6
18101+
# 2530| v2530_10(void) = NoOp :
1811518102
# 2531| v2531_1(void) = NoOp :
1811618103
# 2521| v2521_7(void) = ReturnVoid :
18117-
# 2521| v2521_8(void) = AliasedUse : ~m2527_1
18104+
# 2521| v2521_8(void) = AliasedUse : ~m2530_9
1811818105
# 2521| v2521_9(void) = ExitFunction :
1811918106

1812018107
perf-regression.cpp:

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

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16383,7 +16383,7 @@ ir.cpp:
1638316383
# 2502| r2502_2(int) = Load[c] : &:r2502_1, ~m?
1638416384
# 2502| v2502_3(void) = Switch : r2502_2
1638516385
#-----| Case[0] -> Block 1
16386-
#-----| Default -> Block 2
16386+
#-----| Default -> Block 3
1638716387

1638816388
# 2503| Block 1
1638916389
# 2503| v2503_1(void) = NoOp :
@@ -16393,22 +16393,25 @@ ir.cpp:
1639316393
# 2504| v2504_4(void) = Call[ClassWithDestructor] : func:r2504_3, this:r2504_1
1639416394
# 2504| mu2504_5(unknown) = ^CallSideEffect : ~m?
1639516395
# 2504| mu2504_6(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2504_1
16396-
# 2505| v2505_1(void) = NoOp :
1639716396
# 2506| r2506_1(glval<ClassWithDestructor>) = VariableAddress[x] :
1639816397
# 2506| r2506_2(glval<unknown>) = FunctionAddress[~ClassWithDestructor] :
1639916398
# 2506| v2506_3(void) = Call[~ClassWithDestructor] : func:r2506_2, this:r2506_1
1640016399
# 2506| mu2506_4(unknown) = ^CallSideEffect : ~m?
1640116400
# 2506| v2506_5(void) = ^IndirectReadSideEffect[-1] : &:r2506_1, ~m?
1640216401
# 2506| mu2506_6(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2506_1
16402+
# 2505| v2505_1(void) = NoOp :
16403+
#-----| Goto -> Block 3
16404+
16405+
# 2506| Block 2
1640316406
# 2506| r2506_7(glval<ClassWithDestructor>) = VariableAddress[x] :
1640416407
# 2506| r2506_8(glval<unknown>) = FunctionAddress[~ClassWithDestructor] :
1640516408
# 2506| v2506_9(void) = Call[~ClassWithDestructor] : func:r2506_8, this:r2506_7
1640616409
# 2506| mu2506_10(unknown) = ^CallSideEffect : ~m?
1640716410
# 2506| v2506_11(void) = ^IndirectReadSideEffect[-1] : &:r2506_7, ~m?
1640816411
# 2506| mu2506_12(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2506_7
16409-
#-----| Goto -> Block 2
16412+
#-----| Goto -> Block 3
1641016413

16411-
# 2507| Block 2
16414+
# 2507| Block 3
1641216415
# 2507| v2507_1(void) = NoOp :
1641316416
# 2508| v2508_1(void) = NoOp :
1641416417
# 2501| v2501_6(void) = ReturnVoid :
@@ -16477,7 +16480,7 @@ ir.cpp:
1647716480
# 2522| r2522_8(int) = Load[c] : &:r2522_7, ~m?
1647816481
# 2522| v2522_9(void) = Switch : r2522_8
1647916482
#-----| Case[0] -> Block 1
16480-
#-----| Default -> Block 2
16483+
#-----| Default -> Block 3
1648116484

1648216485
# 2523| Block 1
1648316486
# 2523| v2523_1(void) = NoOp :
@@ -16487,7 +16490,6 @@ ir.cpp:
1648716490
# 2524| v2524_4(void) = Call[ClassWithDestructor] : func:r2524_3, this:r2524_1
1648816491
# 2524| mu2524_5(unknown) = ^CallSideEffect : ~m?
1648916492
# 2524| mu2524_6(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2524_1
16490-
# 2525| v2525_1(void) = NoOp :
1649116493
# 2526| r2526_1(glval<ClassWithDestructor>) = VariableAddress[x] :
1649216494
# 2526| r2526_2(glval<unknown>) = FunctionAddress[~ClassWithDestructor] :
1649316495
# 2526| v2526_3(void) = Call[~ClassWithDestructor] : func:r2526_2, this:r2526_1
@@ -16500,29 +16502,33 @@ ir.cpp:
1650016502
# 2530| mu2530_4(unknown) = ^CallSideEffect : ~m?
1650116503
# 2530| v2530_5(void) = ^IndirectReadSideEffect[-1] : &:r2530_1, ~m?
1650216504
# 2530| mu2530_6(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2530_1
16505+
# 2525| v2525_1(void) = NoOp :
16506+
#-----| Goto -> Block 5
16507+
16508+
# 2526| Block 2
1650316509
# 2526| r2526_7(glval<ClassWithDestructor>) = VariableAddress[x] :
1650416510
# 2526| r2526_8(glval<unknown>) = FunctionAddress[~ClassWithDestructor] :
1650516511
# 2526| v2526_9(void) = Call[~ClassWithDestructor] : func:r2526_8, this:r2526_7
1650616512
# 2526| mu2526_10(unknown) = ^CallSideEffect : ~m?
1650716513
# 2526| v2526_11(void) = ^IndirectReadSideEffect[-1] : &:r2526_7, ~m?
1650816514
# 2526| mu2526_12(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2526_7
16509-
#-----| Goto -> Block 2
16515+
#-----| Goto -> Block 3
1651016516

16511-
# 2527| Block 2
16517+
# 2527| Block 3
1651216518
# 2527| v2527_1(void) = NoOp :
1651316519
# 2528| v2528_1(void) = NoOp :
16514-
#-----| Goto -> Block 4
16520+
#-----| Goto -> Block 5
1651516521

16516-
# 2530| Block 3
16522+
# 2530| Block 4
1651716523
# 2530| r2530_7(glval<ClassWithDestructor>) = VariableAddress[y] :
1651816524
# 2530| r2530_8(glval<unknown>) = FunctionAddress[~ClassWithDestructor] :
1651916525
# 2530| v2530_9(void) = Call[~ClassWithDestructor] : func:r2530_8, this:r2530_7
1652016526
# 2530| mu2530_10(unknown) = ^CallSideEffect : ~m?
1652116527
# 2530| v2530_11(void) = ^IndirectReadSideEffect[-1] : &:r2530_7, ~m?
1652216528
# 2530| mu2530_12(ClassWithDestructor) = ^IndirectMayWriteSideEffect[-1] : &:r2530_7
16523-
#-----| Goto -> Block 4
16529+
#-----| Goto -> Block 5
1652416530

16525-
# 2530| Block 4
16531+
# 2530| Block 5
1652616532
# 2530| v2530_13(void) = NoOp :
1652716533
# 2531| v2531_1(void) = NoOp :
1652816534
# 2521| v2521_6(void) = ReturnVoid :

0 commit comments

Comments
 (0)