Skip to content

Commit fa1f04f

Browse files
IdrissRioIdrissRio
committed
C++: accept new test results after extractor changes
1 parent 8d16d02 commit fa1f04f

8 files changed

+177
-87
lines changed

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9459,6 +9459,19 @@ ir.cpp:
94599459
# 745| getExpr(): [ConstructorCall] call to String
94609460
# 745| Type = [VoidType] void
94619461
# 745| ValueCategory = prvalue
9462+
# 745| getArgument(0): [VariableAccess] (unnamed parameter 0)
9463+
# 745| Type = [LValueReferenceType] const String &
9464+
# 745| ValueCategory = prvalue(load)
9465+
# 745| getArgument(0).getFullyConverted(): [ReferenceToExpr] (reference to)
9466+
# 745| Type = [LValueReferenceType] const String &
9467+
# 745| ValueCategory = prvalue
9468+
# 745| getExpr(): [CStyleCast] (const String)...
9469+
# 745| Conversion = [BaseClassConversion] base class conversion
9470+
# 745| Type = [SpecifiedType] const String
9471+
# 745| ValueCategory = lvalue
9472+
# 745| getExpr(): [ReferenceDereferenceExpr] (reference dereference)
9473+
# 745| Type = [SpecifiedType] const String
9474+
# 745| ValueCategory = lvalue
94629475
# 745| getEntryPoint(): [BlockStmt] { ... }
94639476
# 745| getStmt(0): [ReturnStmt] return ...
94649477
# 748| [Constructor] void Base::Base()
@@ -11996,6 +12009,19 @@ ir.cpp:
1199612009
# 1045| getAFieldExpr(s): [ConstructorCall] call to String
1199712010
# 1045| Type = [VoidType] void
1199812011
# 1045| ValueCategory = prvalue
12012+
# 1045| getArgument(0): [VariableAccess] (unnamed parameter 0)
12013+
# 1045| Type = [LValueReferenceType] const String &
12014+
# 1045| ValueCategory = prvalue(load)
12015+
#-----| getArgument(0).getFullyConverted(): [ReferenceToExpr] (reference to)
12016+
#-----| Type = [LValueReferenceType] const String &
12017+
#-----| ValueCategory = prvalue
12018+
#-----| getExpr(): [CStyleCast] (const String)...
12019+
#-----| Conversion = [BaseClassConversion] base class conversion
12020+
#-----| Type = [SpecifiedType] const String
12021+
#-----| ValueCategory = lvalue
12022+
#-----| getExpr(): [ReferenceDereferenceExpr] (reference dereference)
12023+
#-----| Type = [SpecifiedType] const String
12024+
#-----| ValueCategory = lvalue
1199912025
# 1045| getAFieldExpr(x): [VariableAccess] x
1200012026
# 1045| Type = [IntType] int
1200112027
# 1045| ValueCategory = prvalue(load)
@@ -12071,6 +12097,19 @@ ir.cpp:
1207112097
# 1049| getAFieldExpr(s): [ConstructorCall] call to String
1207212098
# 1049| Type = [VoidType] void
1207312099
# 1049| ValueCategory = prvalue
12100+
# 1049| getArgument(0): [VariableAccess] (unnamed parameter 0)
12101+
# 1049| Type = [LValueReferenceType] const String &
12102+
# 1049| ValueCategory = prvalue(load)
12103+
#-----| getArgument(0).getFullyConverted(): [ReferenceToExpr] (reference to)
12104+
#-----| Type = [LValueReferenceType] const String &
12105+
#-----| ValueCategory = prvalue
12106+
#-----| getExpr(): [CStyleCast] (const String)...
12107+
#-----| Conversion = [BaseClassConversion] base class conversion
12108+
#-----| Type = [SpecifiedType] const String
12109+
#-----| ValueCategory = lvalue
12110+
#-----| getExpr(): [ReferenceDereferenceExpr] (reference dereference)
12111+
#-----| Type = [SpecifiedType] const String
12112+
#-----| ValueCategory = lvalue
1207412113
# 1050| getStmt(9): [ExprStmt] ExprStmt
1207512114
# 1050| getExpr(): [FunctionCall] call to operator()
1207612115
# 1050| Type = [PlainCharType] char

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

Lines changed: 69 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -7501,32 +7501,38 @@ ir.cpp:
75017501

75027502
# 745| void Base::Base(Base const&)
75037503
# 745| Block 0
7504-
# 745| v745_1(void) = EnterFunction :
7505-
# 745| m745_2(unknown) = AliasedDefinition :
7506-
# 745| m745_3(unknown) = InitializeNonLocal :
7507-
# 745| m745_4(unknown) = Chi : total:m745_2, partial:m745_3
7508-
# 745| r745_5(glval<unknown>) = VariableAddress[#this] :
7509-
# 745| m745_6(glval<Base>) = InitializeParameter[#this] : &:r745_5
7510-
# 745| r745_7(glval<Base>) = Load[#this] : &:r745_5, m745_6
7511-
# 745| m745_8(Base) = InitializeIndirection[#this] : &:r745_7
7512-
# 745| m745_9(unknown) = Chi : total:m745_4, partial:m745_8
7513-
#-----| r0_1(glval<Base &>) = VariableAddress[(unnamed parameter 0)] :
7514-
#-----| m0_2(Base &) = InitializeParameter[(unnamed parameter 0)] : &:r0_1
7515-
#-----| r0_3(Base &) = Load[(unnamed parameter 0)] : &:r0_1, m0_2
7516-
#-----| m0_4(unknown) = InitializeIndirection[(unnamed parameter 0)] : &:r0_3
7517-
# 745| r745_10(glval<String>) = FieldAddress[base_s] : m745_6
7518-
# 745| r745_11(glval<unknown>) = FunctionAddress[String] :
7519-
# 745| v745_12(void) = Call[String] : func:r745_11, this:r745_10
7520-
# 745| m745_13(unknown) = ^CallSideEffect : ~m745_9
7521-
# 745| m745_14(unknown) = Chi : total:m745_9, partial:m745_13
7522-
# 745| m745_15(String) = ^IndirectMayWriteSideEffect[-1] : &:r745_10
7523-
# 745| m745_16(unknown) = Chi : total:m745_14, partial:m745_15
7524-
# 745| v745_17(void) = NoOp :
7525-
# 745| v745_18(void) = ReturnIndirection[#this] : &:r745_7, ~m745_16
7526-
#-----| v0_5(void) = ReturnIndirection[(unnamed parameter 0)] : &:r0_3, m0_4
7527-
# 745| v745_19(void) = ReturnVoid :
7528-
# 745| v745_20(void) = AliasedUse : ~m745_16
7529-
# 745| v745_21(void) = ExitFunction :
7504+
# 745| v745_1(void) = EnterFunction :
7505+
# 745| m745_2(unknown) = AliasedDefinition :
7506+
# 745| m745_3(unknown) = InitializeNonLocal :
7507+
# 745| m745_4(unknown) = Chi : total:m745_2, partial:m745_3
7508+
# 745| r745_5(glval<unknown>) = VariableAddress[#this] :
7509+
# 745| m745_6(glval<Base>) = InitializeParameter[#this] : &:r745_5
7510+
# 745| r745_7(glval<Base>) = Load[#this] : &:r745_5, m745_6
7511+
# 745| m745_8(Base) = InitializeIndirection[#this] : &:r745_7
7512+
# 745| m745_9(unknown) = Chi : total:m745_4, partial:m745_8
7513+
#-----| r0_1(glval<Base &>) = VariableAddress[(unnamed parameter 0)] :
7514+
#-----| m0_2(Base &) = InitializeParameter[(unnamed parameter 0)] : &:r0_1
7515+
#-----| r0_3(Base &) = Load[(unnamed parameter 0)] : &:r0_1, m0_2
7516+
#-----| m0_4(unknown) = InitializeIndirection[(unnamed parameter 0)] : &:r0_3
7517+
# 745| r745_10(glval<String>) = FieldAddress[base_s] : m745_6
7518+
# 745| r745_11(glval<unknown>) = FunctionAddress[String] :
7519+
# 745| r745_12(glval<String &>) = VariableAddress :
7520+
# 745| r745_13(String &) = Load[?] : &:r745_12, ~m745_9
7521+
# 745| r745_14(glval<String>) = CopyValue : r745_13
7522+
# 745| r745_15(glval<String>) = ConvertToVirtualBase[String : String] : r745_14
7523+
# 745| r745_16(String &) = CopyValue : r745_15
7524+
# 745| v745_17(void) = Call[String] : func:r745_11, this:r745_10, 0:r745_16
7525+
# 745| m745_18(unknown) = ^CallSideEffect : ~m745_9
7526+
# 745| m745_19(unknown) = Chi : total:m745_9, partial:m745_18
7527+
# 745| v745_20(void) = ^BufferReadSideEffect[0] : &:r745_16, ~m745_19
7528+
# 745| m745_21(String) = ^IndirectMayWriteSideEffect[-1] : &:r745_10
7529+
# 745| m745_22(unknown) = Chi : total:m745_19, partial:m745_21
7530+
# 745| v745_23(void) = NoOp :
7531+
# 745| v745_24(void) = ReturnIndirection[#this] : &:r745_7, ~m745_22
7532+
#-----| v0_5(void) = ReturnIndirection[(unnamed parameter 0)] : &:r0_3, m0_4
7533+
# 745| v745_25(void) = ReturnVoid :
7534+
# 745| v745_26(void) = AliasedUse : ~m745_22
7535+
# 745| v745_27(void) = ExitFunction :
75307536

75317537
# 748| void Base::Base()
75327538
# 748| Block 0
@@ -9542,26 +9548,32 @@ ir.cpp:
95429548
# 1045| m1045_4(unknown) = Chi : total:m1044_7, partial:m1045_3
95439549
# 1045| r1045_5(glval<String>) = FieldAddress[s] : r1045_2
95449550
# 1045| r1045_6(glval<unknown>) = FunctionAddress[String] :
9545-
# 1045| v1045_7(void) = Call[String] : func:r1045_6, this:r1045_5
9546-
# 1045| m1045_8(unknown) = ^CallSideEffect : ~m1045_4
9547-
# 1045| m1045_9(unknown) = Chi : total:m1045_4, partial:m1045_8
9548-
# 1045| m1045_10(String) = ^IndirectMayWriteSideEffect[-1] : &:r1045_5
9549-
# 1045| m1045_11(unknown) = Chi : total:m1045_9, partial:m1045_10
9550-
# 1045| r1045_12(glval<int>) = FieldAddress[x] : r1045_2
9551-
# 1045| r1045_13(glval<int>) = VariableAddress[x] :
9552-
# 1045| r1045_14(int) = Load[x] : &:r1045_13, ~m1045_9
9553-
# 1045| m1045_15(int) = Store[?] : &:r1045_12, r1045_14
9554-
# 1045| m1045_16(unknown) = Chi : total:m1045_11, partial:m1045_15
9555-
# 1045| r1045_17(decltype([...](...){...})) = Load[#temp1045:20] : &:r1045_2, ~m1045_16
9556-
# 1045| m1045_18(decltype([...](...){...})) = Store[lambda_val] : &:r1045_1, r1045_17
9557-
# 1045| m1045_19(unknown) = Chi : total:m1045_16, partial:m1045_18
9551+
# 1045| r1045_7(glval<String &>) = VariableAddress :
9552+
# 1045| r1045_8(String &) = Load[?] : &:r1045_7, ~m1045_4
9553+
#-----| r0_4(glval<String>) = CopyValue : r1045_8
9554+
#-----| r0_5(glval<String>) = ConvertToVirtualBase[String : String] : r0_4
9555+
#-----| r0_6(String &) = CopyValue : r0_5
9556+
# 1045| v1045_9(void) = Call[String] : func:r1045_6, this:r1045_5, 0:r0_6
9557+
# 1045| m1045_10(unknown) = ^CallSideEffect : ~m1045_4
9558+
# 1045| m1045_11(unknown) = Chi : total:m1045_4, partial:m1045_10
9559+
#-----| v0_7(void) = ^BufferReadSideEffect[0] : &:r0_6, ~m1045_11
9560+
# 1045| m1045_12(String) = ^IndirectMayWriteSideEffect[-1] : &:r1045_5
9561+
# 1045| m1045_13(unknown) = Chi : total:m1045_11, partial:m1045_12
9562+
# 1045| r1045_14(glval<int>) = FieldAddress[x] : r1045_2
9563+
# 1045| r1045_15(glval<int>) = VariableAddress[x] :
9564+
# 1045| r1045_16(int) = Load[x] : &:r1045_15, ~m1045_11
9565+
# 1045| m1045_17(int) = Store[?] : &:r1045_14, r1045_16
9566+
# 1045| m1045_18(unknown) = Chi : total:m1045_13, partial:m1045_17
9567+
# 1045| r1045_19(decltype([...](...){...})) = Load[#temp1045:20] : &:r1045_2, ~m1045_18
9568+
# 1045| m1045_20(decltype([...](...){...})) = Store[lambda_val] : &:r1045_1, r1045_19
9569+
# 1045| m1045_21(unknown) = Chi : total:m1045_18, partial:m1045_20
95589570
# 1046| r1046_1(glval<decltype([...](...){...})>) = VariableAddress[lambda_val] :
95599571
# 1046| r1046_2(glval<decltype([...](...){...})>) = Convert : r1046_1
95609572
# 1046| r1046_3(glval<unknown>) = FunctionAddress[operator()] :
95619573
# 1046| r1046_4(float) = Constant[2.0] :
95629574
# 1046| r1046_5(char) = Call[operator()] : func:r1046_3, this:r1046_2, 0:r1046_4
9563-
# 1046| m1046_6(unknown) = ^CallSideEffect : ~m1045_19
9564-
# 1046| m1046_7(unknown) = Chi : total:m1045_19, partial:m1046_6
9575+
# 1046| m1046_6(unknown) = ^CallSideEffect : ~m1045_21
9576+
# 1046| m1046_7(unknown) = Chi : total:m1045_21, partial:m1046_6
95659577
# 1046| v1046_8(void) = ^IndirectReadSideEffect[-1] : &:r1046_2, ~m1046_7
95669578
# 1047| r1047_1(glval<decltype([...](...){...})>) = VariableAddress[lambda_ref_explicit] :
95679579
# 1047| r1047_2(glval<decltype([...](...){...})>) = VariableAddress[#temp1047:29] :
@@ -9588,21 +9600,27 @@ ir.cpp:
95889600
# 1049| m1049_4(unknown) = Chi : total:m1048_7, partial:m1049_3
95899601
# 1049| r1049_5(glval<String>) = FieldAddress[s] : r1049_2
95909602
# 1049| r1049_6(glval<unknown>) = FunctionAddress[String] :
9591-
# 1049| v1049_7(void) = Call[String] : func:r1049_6, this:r1049_5
9592-
# 1049| m1049_8(unknown) = ^CallSideEffect : ~m1049_4
9593-
# 1049| m1049_9(unknown) = Chi : total:m1049_4, partial:m1049_8
9594-
# 1049| m1049_10(String) = ^IndirectMayWriteSideEffect[-1] : &:r1049_5
9595-
# 1049| m1049_11(unknown) = Chi : total:m1049_9, partial:m1049_10
9596-
# 1049| r1049_12(decltype([...](...){...})) = Load[#temp1049:29] : &:r1049_2, ~m1049_11
9597-
# 1049| m1049_13(decltype([...](...){...})) = Store[lambda_val_explicit] : &:r1049_1, r1049_12
9598-
# 1049| m1049_14(unknown) = Chi : total:m1049_11, partial:m1049_13
9603+
# 1049| r1049_7(glval<String &>) = VariableAddress :
9604+
# 1049| r1049_8(String &) = Load[?] : &:r1049_7, ~m1049_4
9605+
#-----| r0_8(glval<String>) = CopyValue : r1049_8
9606+
#-----| r0_9(glval<String>) = ConvertToVirtualBase[String : String] : r0_8
9607+
#-----| r0_10(String &) = CopyValue : r0_9
9608+
# 1049| v1049_9(void) = Call[String] : func:r1049_6, this:r1049_5, 0:r0_10
9609+
# 1049| m1049_10(unknown) = ^CallSideEffect : ~m1049_4
9610+
# 1049| m1049_11(unknown) = Chi : total:m1049_4, partial:m1049_10
9611+
#-----| v0_11(void) = ^BufferReadSideEffect[0] : &:r0_10, ~m1049_11
9612+
# 1049| m1049_12(String) = ^IndirectMayWriteSideEffect[-1] : &:r1049_5
9613+
# 1049| m1049_13(unknown) = Chi : total:m1049_11, partial:m1049_12
9614+
# 1049| r1049_14(decltype([...](...){...})) = Load[#temp1049:29] : &:r1049_2, ~m1049_13
9615+
# 1049| m1049_15(decltype([...](...){...})) = Store[lambda_val_explicit] : &:r1049_1, r1049_14
9616+
# 1049| m1049_16(unknown) = Chi : total:m1049_13, partial:m1049_15
95999617
# 1050| r1050_1(glval<decltype([...](...){...})>) = VariableAddress[lambda_val_explicit] :
96009618
# 1050| r1050_2(glval<decltype([...](...){...})>) = Convert : r1050_1
96019619
# 1050| r1050_3(glval<unknown>) = FunctionAddress[operator()] :
96029620
# 1050| r1050_4(float) = Constant[4.0] :
96039621
# 1050| r1050_5(char) = Call[operator()] : func:r1050_3, this:r1050_2, 0:r1050_4
9604-
# 1050| m1050_6(unknown) = ^CallSideEffect : ~m1049_14
9605-
# 1050| m1050_7(unknown) = Chi : total:m1049_14, partial:m1050_6
9622+
# 1050| m1050_6(unknown) = ^CallSideEffect : ~m1049_16
9623+
# 1050| m1050_7(unknown) = Chi : total:m1049_16, partial:m1050_6
96069624
# 1050| v1050_8(void) = ^IndirectReadSideEffect[-1] : &:r1050_2, ~m1050_7
96079625
# 1051| r1051_1(glval<decltype([...](...){...})>) = VariableAddress[lambda_mixed_explicit] :
96089626
# 1051| r1051_2(glval<decltype([...](...){...})>) = VariableAddress[#temp1051:31] :

0 commit comments

Comments
 (0)