Skip to content

Commit 9bc04e7

Browse files
jketemajketema
authored
Merge pull request github#16447 from jketema/destructors-loc
C++: Update test results after extractor changes
2 parents c5403f4 + 61580da commit 9bc04e7

File tree

3 files changed

+94
-94
lines changed

3 files changed

+94
-94
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20678,12 +20678,12 @@ ir.cpp:
2067820678
# 2309| getQualifier(): [VariableAccess] s2
2067920679
# 2309| Type = [Struct] String
2068020680
# 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
20681+
# 2307| getImplicitDestructorCall(0): [DestructorCall] call to ~vector
20682+
# 2307| Type = [VoidType] void
20683+
# 2307| ValueCategory = prvalue
20684+
# 2307| getQualifier(): [ReuseExpr] reuse of temporary object
20685+
# 2307| Type = [ClassTemplateInstantiation,Struct] vector<String>
20686+
# 2307| ValueCategory = xvalue
2068720687
# 2307| getUpdate().getFullyConverted(): [ReferenceDereferenceExpr] (reference dereference)
2068820688
# 2307| Type = [ClassTemplateInstantiation,Struct] iterator<random_access_iterator_tag, String, ptrdiff_t, String *, String &>
2068920689
# 2307| ValueCategory = lvalue
@@ -22208,12 +22208,12 @@ ir.cpp:
2220822208
# 2431| Conversion = [IntegralConversion] integral conversion
2220922209
# 2431| Type = [IntType] int
2221022210
# 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
22211+
# 2430| getImplicitDestructorCall(0): [DestructorCall] call to ~vector
22212+
# 2430| Type = [VoidType] void
22213+
# 2430| ValueCategory = prvalue
22214+
# 2430| getQualifier(): [ReuseExpr] reuse of temporary object
22215+
# 2430| Type = [ClassTemplateInstantiation,Struct] vector<char>
22216+
# 2430| ValueCategory = xvalue
2221722217
# 2430| getUpdate().getFullyConverted(): [ReferenceDereferenceExpr] (reference dereference)
2221822218
# 2430| Type = [ClassTemplateInstantiation,Struct] iterator<random_access_iterator_tag, char, ptrdiff_t, char *, char &>
2221922219
# 2430| ValueCategory = lvalue

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

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -16810,39 +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-
#-----| 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
16813+
# 2307| Block 6
16814+
# 2307| r2307_91(glval<vector<String>>) = CopyValue : r2307_2
16815+
# 2307| r2307_92(glval<unknown>) = FunctionAddress[~vector] :
16816+
# 2307| v2307_93(void) = Call[~vector] : func:r2307_92, this:r2307_91
16817+
# 2307| m2307_94(unknown) = ^CallSideEffect : ~m2307_57
16818+
# 2307| m2307_95(unknown) = Chi : total:m2307_57, partial:m2307_94
16819+
# 2307| v2307_96(void) = ^IndirectReadSideEffect[-1] : &:r2307_91, ~m2307_95
16820+
# 2307| m2307_97(vector<String>) = ^IndirectMayWriteSideEffect[-1] : &:r2307_91
16821+
# 2307| m2307_98(unknown) = Chi : total:m2307_95, partial:m2307_97
16822+
# 2311| r2311_1(glval<String>) = VariableAddress[s] :
16823+
# 2311| m2311_2(String) = Uninitialized[s] : &:r2311_1
16824+
# 2311| m2311_3(unknown) = Chi : total:m2307_98, 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
1684616846
#-----| Goto -> Block 7
1684716847

1684816848
# 2311| Block 7
@@ -17681,19 +17681,19 @@ ir.cpp:
1768117681
# 2430| r2430_78(glval<iterator<random_access_iterator_tag, char, ptrdiff_t, char *, char &>>) = CopyValue : r2430_74
1768217682
#-----| Goto (back edge) -> Block 10
1768317683

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 :
17684+
# 2430| Block 12
17685+
# 2430| r2430_79(glval<vector<char>>) = CopyValue : r2430_27
17686+
# 2430| r2430_80(glval<unknown>) = FunctionAddress[~vector] :
17687+
# 2430| v2430_81(void) = Call[~vector] : func:r2430_80, this:r2430_79
17688+
# 2430| m2430_82(unknown) = ^CallSideEffect : ~m2430_63
17689+
# 2430| m2430_83(unknown) = Chi : total:m2430_63, partial:m2430_82
17690+
# 2430| v2430_84(void) = ^IndirectReadSideEffect[-1] : &:r2430_79, ~m2430_83
17691+
# 2430| m2430_85(vector<char>) = ^IndirectMayWriteSideEffect[-1] : &:r2430_79
17692+
# 2430| m2430_86(unknown) = Chi : total:m2430_83, partial:m2430_85
17693+
# 2432| v2432_1(void) = NoOp :
17694+
# 2410| v2410_5(void) = ReturnVoid :
17695+
# 2410| v2410_6(void) = AliasedUse : ~m2430_83
17696+
# 2410| v2410_7(void) = ExitFunction :
1769717697

1769817698
# 2410| Block 13
1769917699
# 2410| v2410_8(void) = Unreached :

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

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15353,31 +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-
#-----| 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
15356+
# 2307| Block 6
15357+
# 2307| r2307_72(glval<vector<String>>) = CopyValue : r2307_2
15358+
# 2307| r2307_73(glval<unknown>) = FunctionAddress[~vector] :
15359+
# 2307| v2307_74(void) = Call[~vector] : func:r2307_73, this:r2307_72
15360+
# 2307| mu2307_75(unknown) = ^CallSideEffect : ~m?
15361+
# 2307| v2307_76(void) = ^IndirectReadSideEffect[-1] : &:r2307_72, ~m?
15362+
# 2307| mu2307_77(vector<String>) = ^IndirectMayWriteSideEffect[-1] : &:r2307_72
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
1538115381
#-----| Goto -> Block 7
1538215382

1538315383
# 2311| Block 7
@@ -16088,17 +16088,17 @@ ir.cpp:
1608816088
# 2430| r2430_63(glval<iterator<random_access_iterator_tag, char, ptrdiff_t, char *, char &>>) = CopyValue : r2430_60
1608916089
#-----| Goto (back edge) -> Block 11
1609016090

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 :
16091+
# 2430| Block 13
16092+
# 2430| r2430_64(glval<vector<char>>) = CopyValue : r2430_21
16093+
# 2430| r2430_65(glval<unknown>) = FunctionAddress[~vector] :
16094+
# 2430| v2430_66(void) = Call[~vector] : func:r2430_65, this:r2430_64
16095+
# 2430| mu2430_67(unknown) = ^CallSideEffect : ~m?
16096+
# 2430| v2430_68(void) = ^IndirectReadSideEffect[-1] : &:r2430_64, ~m?
16097+
# 2430| mu2430_69(vector<char>) = ^IndirectMayWriteSideEffect[-1] : &:r2430_64
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 :
1610216102

1610316103
# 2434| void param_with_destructor_by_value(ClassWithDestructor)
1610416104
# 2434| Block 0

0 commit comments

Comments
 (0)