Skip to content

Commit 8198b1a

Browse files
jketemajketema
authored
Merge pull request github#16426 from jketema/destructors-ranged-based-cleanup
C++: Update test results after extractor changes
2 parents ab3d21c + 4eea214 commit 8198b1a

File tree

3 files changed

+98
-54
lines changed

3 files changed

+98
-54
lines changed

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12159,8 +12159,12 @@ ir.cpp:
1215912159
# 1109| Type = [IntType] int
1216012160
# 1110| [Destructor] void std::vector<ClassWithDestructor>::~vector()
1216112161
# 1110| <params>:
12162+
# 1110| [Destructor] void std::vector<String>::~vector()
12163+
# 1110| <params>:
1216212164
# 1110| [Destructor] void std::vector<T>::~vector()
1216312165
# 1110| <params>:
12166+
# 1110| [Destructor] void std::vector<char>::~vector()
12167+
# 1110| <params>:
1216412168
# 1110| [Destructor] void std::vector<int>::~vector()
1216512169
# 1110| <params>:
1216612170
# 1115| [ConstMemberFunction] std::vector<ClassWithDestructor>::iterator std::vector<ClassWithDestructor>::begin() const
@@ -20674,6 +20678,12 @@ ir.cpp:
2067420678
# 2309| getQualifier(): [VariableAccess] s2
2067520679
# 2309| Type = [Struct] String
2067620680
# 2309| ValueCategory = lvalue
20681+
#-----| getImplicitDestructorCall(0): [DestructorCall] call to ~vector
20682+
#-----| Type = [VoidType] void
20683+
#-----| ValueCategory = prvalue
20684+
#-----| getQualifier(): [ReuseExpr] reuse of temporary object
20685+
#-----| Type = [ClassTemplateInstantiation,Struct] vector<String>
20686+
#-----| ValueCategory = xvalue
2067720687
# 2307| getUpdate().getFullyConverted(): [ReferenceDereferenceExpr] (reference dereference)
2067820688
# 2307| Type = [ClassTemplateInstantiation,Struct] iterator<random_access_iterator_tag, String, ptrdiff_t, String *, String &>
2067920689
# 2307| ValueCategory = lvalue
@@ -22198,6 +22208,12 @@ ir.cpp:
2219822208
# 2431| Conversion = [IntegralConversion] integral conversion
2219922209
# 2431| Type = [IntType] int
2220022210
# 2431| ValueCategory = prvalue
22211+
#-----| getImplicitDestructorCall(0): [DestructorCall] call to ~vector
22212+
#-----| Type = [VoidType] void
22213+
#-----| ValueCategory = prvalue
22214+
#-----| getQualifier(): [ReuseExpr] reuse of temporary object
22215+
#-----| Type = [ClassTemplateInstantiation,Struct] vector<char>
22216+
#-----| ValueCategory = xvalue
2220122217
# 2430| getUpdate().getFullyConverted(): [ReferenceDereferenceExpr] (reference dereference)
2220222218
# 2430| Type = [ClassTemplateInstantiation,Struct] iterator<random_access_iterator_tag, char, ptrdiff_t, char *, char &>
2220322219
# 2430| ValueCategory = lvalue

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

Lines changed: 46 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16810,31 +16810,39 @@ ir.cpp:
1681016810
# 2307| r2307_90(glval<iterator<random_access_iterator_tag, String, ptrdiff_t, String *, String &>>) = CopyValue : r2307_78
1681116811
#-----| Goto (back edge) -> Block 4
1681216812

16813-
# 2311| Block 6
16814-
# 2311| r2311_1(glval<String>) = VariableAddress[s] :
16815-
# 2311| m2311_2(String) = Uninitialized[s] : &:r2311_1
16816-
# 2311| m2311_3(unknown) = Chi : total:m2307_57, partial:m2311_2
16817-
# 2311| r2311_4(glval<unknown>) = FunctionAddress[String] :
16818-
# 2311| r2311_5(glval<char[6]>) = StringConstant["hello"] :
16819-
# 2311| r2311_6(char *) = Convert : r2311_5
16820-
# 2311| v2311_7(void) = Call[String] : func:r2311_4, this:r2311_1, 0:r2311_6
16821-
# 2311| m2311_8(unknown) = ^CallSideEffect : ~m2311_3
16822-
# 2311| m2311_9(unknown) = Chi : total:m2311_3, partial:m2311_8
16823-
# 2311| v2311_10(void) = ^BufferReadSideEffect[0] : &:r2311_6, ~m2301_3
16824-
# 2311| m2311_11(String) = ^IndirectMayWriteSideEffect[-1] : &:r2311_1
16825-
# 2311| m2311_12(unknown) = Chi : total:m2311_9, partial:m2311_11
16826-
# 2311| r2311_13(glval<String>) = VariableAddress[s2] :
16827-
# 2311| m2311_14(String) = Uninitialized[s2] : &:r2311_13
16828-
# 2311| m2311_15(unknown) = Chi : total:m2311_12, partial:m2311_14
16829-
# 2311| r2311_16(glval<unknown>) = FunctionAddress[String] :
16830-
# 2311| r2311_17(glval<char[6]>) = StringConstant["world"] :
16831-
# 2311| r2311_18(char *) = Convert : r2311_17
16832-
# 2311| v2311_19(void) = Call[String] : func:r2311_16, this:r2311_13, 0:r2311_18
16833-
# 2311| m2311_20(unknown) = ^CallSideEffect : ~m2311_15
16834-
# 2311| m2311_21(unknown) = Chi : total:m2311_15, partial:m2311_20
16835-
# 2311| v2311_22(void) = ^BufferReadSideEffect[0] : &:r2311_18, ~m2301_3
16836-
# 2311| m2311_23(String) = ^IndirectMayWriteSideEffect[-1] : &:r2311_13
16837-
# 2311| m2311_24(unknown) = Chi : total:m2311_21, partial:m2311_23
16813+
#-----| Block 6
16814+
#-----| r0_18(glval<vector<String>>) = CopyValue : r2307_2
16815+
#-----| r0_19(glval<unknown>) = FunctionAddress[~vector] :
16816+
#-----| v0_20(void) = Call[~vector] : func:r0_19, this:r0_18
16817+
#-----| m0_21(unknown) = ^CallSideEffect : ~m2307_57
16818+
#-----| m0_22(unknown) = Chi : total:m2307_57, partial:m0_21
16819+
#-----| v0_23(void) = ^IndirectReadSideEffect[-1] : &:r0_18, ~m0_22
16820+
#-----| m0_24(vector<String>) = ^IndirectMayWriteSideEffect[-1] : &:r0_18
16821+
#-----| m0_25(unknown) = Chi : total:m0_22, partial:m0_24
16822+
# 2311| r2311_1(glval<String>) = VariableAddress[s] :
16823+
# 2311| m2311_2(String) = Uninitialized[s] : &:r2311_1
16824+
# 2311| m2311_3(unknown) = Chi : total:m0_25, partial:m2311_2
16825+
# 2311| r2311_4(glval<unknown>) = FunctionAddress[String] :
16826+
# 2311| r2311_5(glval<char[6]>) = StringConstant["hello"] :
16827+
# 2311| r2311_6(char *) = Convert : r2311_5
16828+
# 2311| v2311_7(void) = Call[String] : func:r2311_4, this:r2311_1, 0:r2311_6
16829+
# 2311| m2311_8(unknown) = ^CallSideEffect : ~m2311_3
16830+
# 2311| m2311_9(unknown) = Chi : total:m2311_3, partial:m2311_8
16831+
# 2311| v2311_10(void) = ^BufferReadSideEffect[0] : &:r2311_6, ~m2301_3
16832+
# 2311| m2311_11(String) = ^IndirectMayWriteSideEffect[-1] : &:r2311_1
16833+
# 2311| m2311_12(unknown) = Chi : total:m2311_9, partial:m2311_11
16834+
# 2311| r2311_13(glval<String>) = VariableAddress[s2] :
16835+
# 2311| m2311_14(String) = Uninitialized[s2] : &:r2311_13
16836+
# 2311| m2311_15(unknown) = Chi : total:m2311_12, partial:m2311_14
16837+
# 2311| r2311_16(glval<unknown>) = FunctionAddress[String] :
16838+
# 2311| r2311_17(glval<char[6]>) = StringConstant["world"] :
16839+
# 2311| r2311_18(char *) = Convert : r2311_17
16840+
# 2311| v2311_19(void) = Call[String] : func:r2311_16, this:r2311_13, 0:r2311_18
16841+
# 2311| m2311_20(unknown) = ^CallSideEffect : ~m2311_15
16842+
# 2311| m2311_21(unknown) = Chi : total:m2311_15, partial:m2311_20
16843+
# 2311| v2311_22(void) = ^BufferReadSideEffect[0] : &:r2311_18, ~m2301_3
16844+
# 2311| m2311_23(String) = ^IndirectMayWriteSideEffect[-1] : &:r2311_13
16845+
# 2311| m2311_24(unknown) = Chi : total:m2311_21, partial:m2311_23
1683816846
#-----| Goto -> Block 7
1683916847

1684016848
# 2311| Block 7
@@ -17673,11 +17681,19 @@ ir.cpp:
1767317681
# 2430| r2430_78(glval<iterator<random_access_iterator_tag, char, ptrdiff_t, char *, char &>>) = CopyValue : r2430_74
1767417682
#-----| Goto (back edge) -> Block 10
1767517683

17676-
# 2432| Block 12
17677-
# 2432| v2432_1(void) = NoOp :
17678-
# 2410| v2410_5(void) = ReturnVoid :
17679-
# 2410| v2410_6(void) = AliasedUse : ~m2430_61
17680-
# 2410| v2410_7(void) = ExitFunction :
17684+
#-----| Block 12
17685+
#-----| r0_18(glval<vector<char>>) = CopyValue : r2430_27
17686+
#-----| r0_19(glval<unknown>) = FunctionAddress[~vector] :
17687+
#-----| v0_20(void) = Call[~vector] : func:r0_19, this:r0_18
17688+
#-----| m0_21(unknown) = ^CallSideEffect : ~m2430_63
17689+
#-----| m0_22(unknown) = Chi : total:m2430_63, partial:m0_21
17690+
#-----| v0_23(void) = ^IndirectReadSideEffect[-1] : &:r0_18, ~m0_22
17691+
#-----| m0_24(vector<char>) = ^IndirectMayWriteSideEffect[-1] : &:r0_18
17692+
#-----| m0_25(unknown) = Chi : total:m0_22, partial:m0_24
17693+
# 2432| v2432_1(void) = NoOp :
17694+
# 2410| v2410_5(void) = ReturnVoid :
17695+
# 2410| v2410_6(void) = AliasedUse : ~m0_22
17696+
# 2410| v2410_7(void) = ExitFunction :
1768117697

1768217698
# 2410| Block 13
1768317699
# 2410| v2410_8(void) = Unreached :

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

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15353,25 +15353,31 @@ ir.cpp:
1535315353
# 2307| r2307_71(glval<iterator<random_access_iterator_tag, String, ptrdiff_t, String *, String &>>) = CopyValue : r2307_62
1535415354
#-----| Goto (back edge) -> Block 4
1535515355

15356-
# 2311| Block 6
15357-
# 2311| r2311_1(glval<String>) = VariableAddress[s] :
15358-
# 2311| mu2311_2(String) = Uninitialized[s] : &:r2311_1
15359-
# 2311| r2311_3(glval<unknown>) = FunctionAddress[String] :
15360-
# 2311| r2311_4(glval<char[6]>) = StringConstant["hello"] :
15361-
# 2311| r2311_5(char *) = Convert : r2311_4
15362-
# 2311| v2311_6(void) = Call[String] : func:r2311_3, this:r2311_1, 0:r2311_5
15363-
# 2311| mu2311_7(unknown) = ^CallSideEffect : ~m?
15364-
# 2311| v2311_8(void) = ^BufferReadSideEffect[0] : &:r2311_5, ~m?
15365-
# 2311| mu2311_9(String) = ^IndirectMayWriteSideEffect[-1] : &:r2311_1
15366-
# 2311| r2311_10(glval<String>) = VariableAddress[s2] :
15367-
# 2311| mu2311_11(String) = Uninitialized[s2] : &:r2311_10
15368-
# 2311| r2311_12(glval<unknown>) = FunctionAddress[String] :
15369-
# 2311| r2311_13(glval<char[6]>) = StringConstant["world"] :
15370-
# 2311| r2311_14(char *) = Convert : r2311_13
15371-
# 2311| v2311_15(void) = Call[String] : func:r2311_12, this:r2311_10, 0:r2311_14
15372-
# 2311| mu2311_16(unknown) = ^CallSideEffect : ~m?
15373-
# 2311| v2311_17(void) = ^BufferReadSideEffect[0] : &:r2311_14, ~m?
15374-
# 2311| mu2311_18(String) = ^IndirectMayWriteSideEffect[-1] : &:r2311_10
15356+
#-----| Block 6
15357+
#-----| r0_17(glval<vector<String>>) = CopyValue : r2307_2
15358+
#-----| r0_18(glval<unknown>) = FunctionAddress[~vector] :
15359+
#-----| v0_19(void) = Call[~vector] : func:r0_18, this:r0_17
15360+
#-----| mu0_20(unknown) = ^CallSideEffect : ~m?
15361+
#-----| v0_21(void) = ^IndirectReadSideEffect[-1] : &:r0_17, ~m?
15362+
#-----| mu0_22(vector<String>) = ^IndirectMayWriteSideEffect[-1] : &:r0_17
15363+
# 2311| r2311_1(glval<String>) = VariableAddress[s] :
15364+
# 2311| mu2311_2(String) = Uninitialized[s] : &:r2311_1
15365+
# 2311| r2311_3(glval<unknown>) = FunctionAddress[String] :
15366+
# 2311| r2311_4(glval<char[6]>) = StringConstant["hello"] :
15367+
# 2311| r2311_5(char *) = Convert : r2311_4
15368+
# 2311| v2311_6(void) = Call[String] : func:r2311_3, this:r2311_1, 0:r2311_5
15369+
# 2311| mu2311_7(unknown) = ^CallSideEffect : ~m?
15370+
# 2311| v2311_8(void) = ^BufferReadSideEffect[0] : &:r2311_5, ~m?
15371+
# 2311| mu2311_9(String) = ^IndirectMayWriteSideEffect[-1] : &:r2311_1
15372+
# 2311| r2311_10(glval<String>) = VariableAddress[s2] :
15373+
# 2311| mu2311_11(String) = Uninitialized[s2] : &:r2311_10
15374+
# 2311| r2311_12(glval<unknown>) = FunctionAddress[String] :
15375+
# 2311| r2311_13(glval<char[6]>) = StringConstant["world"] :
15376+
# 2311| r2311_14(char *) = Convert : r2311_13
15377+
# 2311| v2311_15(void) = Call[String] : func:r2311_12, this:r2311_10, 0:r2311_14
15378+
# 2311| mu2311_16(unknown) = ^CallSideEffect : ~m?
15379+
# 2311| v2311_17(void) = ^BufferReadSideEffect[0] : &:r2311_14, ~m?
15380+
# 2311| mu2311_18(String) = ^IndirectMayWriteSideEffect[-1] : &:r2311_10
1537515381
#-----| Goto -> Block 7
1537615382

1537715383
# 2311| Block 7
@@ -16082,11 +16088,17 @@ ir.cpp:
1608216088
# 2430| r2430_63(glval<iterator<random_access_iterator_tag, char, ptrdiff_t, char *, char &>>) = CopyValue : r2430_60
1608316089
#-----| Goto (back edge) -> Block 11
1608416090

16085-
# 2432| Block 13
16086-
# 2432| v2432_1(void) = NoOp :
16087-
# 2410| v2410_4(void) = ReturnVoid :
16088-
# 2410| v2410_5(void) = AliasedUse : ~m?
16089-
# 2410| v2410_6(void) = ExitFunction :
16091+
#-----| Block 13
16092+
#-----| r0_17(glval<vector<char>>) = CopyValue : r2430_21
16093+
#-----| r0_18(glval<unknown>) = FunctionAddress[~vector] :
16094+
#-----| v0_19(void) = Call[~vector] : func:r0_18, this:r0_17
16095+
#-----| mu0_20(unknown) = ^CallSideEffect : ~m?
16096+
#-----| v0_21(void) = ^IndirectReadSideEffect[-1] : &:r0_17, ~m?
16097+
#-----| mu0_22(vector<char>) = ^IndirectMayWriteSideEffect[-1] : &:r0_17
16098+
# 2432| v2432_1(void) = NoOp :
16099+
# 2410| v2410_4(void) = ReturnVoid :
16100+
# 2410| v2410_5(void) = AliasedUse : ~m?
16101+
# 2410| v2410_6(void) = ExitFunction :
1609016102

1609116103
# 2434| void param_with_destructor_by_value(ClassWithDestructor)
1609216104
# 2434| Block 0

0 commit comments

Comments
 (0)