Skip to content

C++: accept new test results after extractor changes #19941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions cpp/ql/test/library-tests/ir/ir/PrintAST.expected
Original file line number Diff line number Diff line change
Expand Up @@ -9459,6 +9459,19 @@ ir.cpp:
# 745| getExpr(): [ConstructorCall] call to String
# 745| Type = [VoidType] void
# 745| ValueCategory = prvalue
# 745| getArgument(0): [VariableAccess] (unnamed parameter 0)
# 745| Type = [LValueReferenceType] const String &
# 745| ValueCategory = prvalue(load)
# 745| getArgument(0).getFullyConverted(): [ReferenceToExpr] (reference to)
# 745| Type = [LValueReferenceType] const String &
# 745| ValueCategory = prvalue
# 745| getExpr(): [CStyleCast] (const String)...
# 745| Conversion = [BaseClassConversion] base class conversion
# 745| Type = [SpecifiedType] const String
# 745| ValueCategory = lvalue
# 745| getExpr(): [ReferenceDereferenceExpr] (reference dereference)
# 745| Type = [SpecifiedType] const String
# 745| ValueCategory = lvalue
# 745| getEntryPoint(): [BlockStmt] { ... }
# 745| getStmt(0): [ReturnStmt] return ...
# 748| [Constructor] void Base::Base()
Expand Down Expand Up @@ -11996,6 +12009,19 @@ ir.cpp:
# 1045| getAFieldExpr(s): [ConstructorCall] call to String
# 1045| Type = [VoidType] void
# 1045| ValueCategory = prvalue
# 1045| getArgument(0): [VariableAccess] (unnamed parameter 0)
# 1045| Type = [LValueReferenceType] const String &
# 1045| ValueCategory = prvalue(load)
#-----| getArgument(0).getFullyConverted(): [ReferenceToExpr] (reference to)
#-----| Type = [LValueReferenceType] const String &
#-----| ValueCategory = prvalue
#-----| getExpr(): [CStyleCast] (const String)...
#-----| Conversion = [BaseClassConversion] base class conversion
#-----| Type = [SpecifiedType] const String
#-----| ValueCategory = lvalue
#-----| getExpr(): [ReferenceDereferenceExpr] (reference dereference)
#-----| Type = [SpecifiedType] const String
#-----| ValueCategory = lvalue
# 1045| getAFieldExpr(x): [VariableAccess] x
# 1045| Type = [IntType] int
# 1045| ValueCategory = prvalue(load)
Expand Down Expand Up @@ -12071,6 +12097,19 @@ ir.cpp:
# 1049| getAFieldExpr(s): [ConstructorCall] call to String
# 1049| Type = [VoidType] void
# 1049| ValueCategory = prvalue
# 1049| getArgument(0): [VariableAccess] (unnamed parameter 0)
# 1049| Type = [LValueReferenceType] const String &
# 1049| ValueCategory = prvalue(load)
#-----| getArgument(0).getFullyConverted(): [ReferenceToExpr] (reference to)
#-----| Type = [LValueReferenceType] const String &
#-----| ValueCategory = prvalue
#-----| getExpr(): [CStyleCast] (const String)...
#-----| Conversion = [BaseClassConversion] base class conversion
#-----| Type = [SpecifiedType] const String
#-----| ValueCategory = lvalue
#-----| getExpr(): [ReferenceDereferenceExpr] (reference dereference)
#-----| Type = [SpecifiedType] const String
#-----| ValueCategory = lvalue
# 1050| getStmt(9): [ExprStmt] ExprStmt
# 1050| getExpr(): [FunctionCall] call to operator()
# 1050| Type = [PlainCharType] char
Expand Down
120 changes: 69 additions & 51 deletions cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
Original file line number Diff line number Diff line change
Expand Up @@ -7501,32 +7501,38 @@ ir.cpp:

# 745| void Base::Base(Base const&)
# 745| Block 0
# 745| v745_1(void) = EnterFunction :
# 745| m745_2(unknown) = AliasedDefinition :
# 745| m745_3(unknown) = InitializeNonLocal :
# 745| m745_4(unknown) = Chi : total:m745_2, partial:m745_3
# 745| r745_5(glval<unknown>) = VariableAddress[#this] :
# 745| m745_6(glval<Base>) = InitializeParameter[#this] : &:r745_5
# 745| r745_7(glval<Base>) = Load[#this] : &:r745_5, m745_6
# 745| m745_8(Base) = InitializeIndirection[#this] : &:r745_7
# 745| m745_9(unknown) = Chi : total:m745_4, partial:m745_8
#-----| r0_1(glval<Base &>) = VariableAddress[(unnamed parameter 0)] :
#-----| m0_2(Base &) = InitializeParameter[(unnamed parameter 0)] : &:r0_1
#-----| r0_3(Base &) = Load[(unnamed parameter 0)] : &:r0_1, m0_2
#-----| m0_4(unknown) = InitializeIndirection[(unnamed parameter 0)] : &:r0_3
# 745| r745_10(glval<String>) = FieldAddress[base_s] : m745_6
# 745| r745_11(glval<unknown>) = FunctionAddress[String] :
# 745| v745_12(void) = Call[String] : func:r745_11, this:r745_10
# 745| m745_13(unknown) = ^CallSideEffect : ~m745_9
# 745| m745_14(unknown) = Chi : total:m745_9, partial:m745_13
# 745| m745_15(String) = ^IndirectMayWriteSideEffect[-1] : &:r745_10
# 745| m745_16(unknown) = Chi : total:m745_14, partial:m745_15
# 745| v745_17(void) = NoOp :
# 745| v745_18(void) = ReturnIndirection[#this] : &:r745_7, ~m745_16
#-----| v0_5(void) = ReturnIndirection[(unnamed parameter 0)] : &:r0_3, m0_4
# 745| v745_19(void) = ReturnVoid :
# 745| v745_20(void) = AliasedUse : ~m745_16
# 745| v745_21(void) = ExitFunction :
# 745| v745_1(void) = EnterFunction :
# 745| m745_2(unknown) = AliasedDefinition :
# 745| m745_3(unknown) = InitializeNonLocal :
# 745| m745_4(unknown) = Chi : total:m745_2, partial:m745_3
# 745| r745_5(glval<unknown>) = VariableAddress[#this] :
# 745| m745_6(glval<Base>) = InitializeParameter[#this] : &:r745_5
# 745| r745_7(glval<Base>) = Load[#this] : &:r745_5, m745_6
# 745| m745_8(Base) = InitializeIndirection[#this] : &:r745_7
# 745| m745_9(unknown) = Chi : total:m745_4, partial:m745_8
#-----| r0_1(glval<Base &>) = VariableAddress[(unnamed parameter 0)] :
#-----| m0_2(Base &) = InitializeParameter[(unnamed parameter 0)] : &:r0_1
#-----| r0_3(Base &) = Load[(unnamed parameter 0)] : &:r0_1, m0_2
#-----| m0_4(unknown) = InitializeIndirection[(unnamed parameter 0)] : &:r0_3
# 745| r745_10(glval<String>) = FieldAddress[base_s] : m745_6
# 745| r745_11(glval<unknown>) = FunctionAddress[String] :
# 745| r745_12(glval<String &>) = VariableAddress :
# 745| r745_13(String &) = Load[?] : &:r745_12, ~m745_9
# 745| r745_14(glval<String>) = CopyValue : r745_13
# 745| r745_15(glval<String>) = ConvertToVirtualBase[String : String] : r745_14
# 745| r745_16(String &) = CopyValue : r745_15
# 745| v745_17(void) = Call[String] : func:r745_11, this:r745_10, 0:r745_16
# 745| m745_18(unknown) = ^CallSideEffect : ~m745_9
# 745| m745_19(unknown) = Chi : total:m745_9, partial:m745_18
# 745| v745_20(void) = ^BufferReadSideEffect[0] : &:r745_16, ~m745_19
# 745| m745_21(String) = ^IndirectMayWriteSideEffect[-1] : &:r745_10
# 745| m745_22(unknown) = Chi : total:m745_19, partial:m745_21
# 745| v745_23(void) = NoOp :
# 745| v745_24(void) = ReturnIndirection[#this] : &:r745_7, ~m745_22
#-----| v0_5(void) = ReturnIndirection[(unnamed parameter 0)] : &:r0_3, m0_4
# 745| v745_25(void) = ReturnVoid :
# 745| v745_26(void) = AliasedUse : ~m745_22
# 745| v745_27(void) = ExitFunction :

# 748| void Base::Base()
# 748| Block 0
Expand Down Expand Up @@ -9542,26 +9548,32 @@ ir.cpp:
# 1045| m1045_4(unknown) = Chi : total:m1044_7, partial:m1045_3
# 1045| r1045_5(glval<String>) = FieldAddress[s] : r1045_2
# 1045| r1045_6(glval<unknown>) = FunctionAddress[String] :
# 1045| v1045_7(void) = Call[String] : func:r1045_6, this:r1045_5
# 1045| m1045_8(unknown) = ^CallSideEffect : ~m1045_4
# 1045| m1045_9(unknown) = Chi : total:m1045_4, partial:m1045_8
# 1045| m1045_10(String) = ^IndirectMayWriteSideEffect[-1] : &:r1045_5
# 1045| m1045_11(unknown) = Chi : total:m1045_9, partial:m1045_10
# 1045| r1045_12(glval<int>) = FieldAddress[x] : r1045_2
# 1045| r1045_13(glval<int>) = VariableAddress[x] :
# 1045| r1045_14(int) = Load[x] : &:r1045_13, ~m1045_9
# 1045| m1045_15(int) = Store[?] : &:r1045_12, r1045_14
# 1045| m1045_16(unknown) = Chi : total:m1045_11, partial:m1045_15
# 1045| r1045_17(decltype([...](...){...})) = Load[#temp1045:20] : &:r1045_2, ~m1045_16
# 1045| m1045_18(decltype([...](...){...})) = Store[lambda_val] : &:r1045_1, r1045_17
# 1045| m1045_19(unknown) = Chi : total:m1045_16, partial:m1045_18
# 1045| r1045_7(glval<String &>) = VariableAddress :
# 1045| r1045_8(String &) = Load[?] : &:r1045_7, ~m1045_4
#-----| r0_4(glval<String>) = CopyValue : r1045_8
#-----| r0_5(glval<String>) = ConvertToVirtualBase[String : String] : r0_4
#-----| r0_6(String &) = CopyValue : r0_5
# 1045| v1045_9(void) = Call[String] : func:r1045_6, this:r1045_5, 0:r0_6
# 1045| m1045_10(unknown) = ^CallSideEffect : ~m1045_4
# 1045| m1045_11(unknown) = Chi : total:m1045_4, partial:m1045_10
#-----| v0_7(void) = ^BufferReadSideEffect[0] : &:r0_6, ~m1045_11
# 1045| m1045_12(String) = ^IndirectMayWriteSideEffect[-1] : &:r1045_5
# 1045| m1045_13(unknown) = Chi : total:m1045_11, partial:m1045_12
# 1045| r1045_14(glval<int>) = FieldAddress[x] : r1045_2
# 1045| r1045_15(glval<int>) = VariableAddress[x] :
# 1045| r1045_16(int) = Load[x] : &:r1045_15, ~m1045_11
# 1045| m1045_17(int) = Store[?] : &:r1045_14, r1045_16
# 1045| m1045_18(unknown) = Chi : total:m1045_13, partial:m1045_17
# 1045| r1045_19(decltype([...](...){...})) = Load[#temp1045:20] : &:r1045_2, ~m1045_18
# 1045| m1045_20(decltype([...](...){...})) = Store[lambda_val] : &:r1045_1, r1045_19
# 1045| m1045_21(unknown) = Chi : total:m1045_18, partial:m1045_20
# 1046| r1046_1(glval<decltype([...](...){...})>) = VariableAddress[lambda_val] :
# 1046| r1046_2(glval<decltype([...](...){...})>) = Convert : r1046_1
# 1046| r1046_3(glval<unknown>) = FunctionAddress[operator()] :
# 1046| r1046_4(float) = Constant[2.0] :
# 1046| r1046_5(char) = Call[operator()] : func:r1046_3, this:r1046_2, 0:r1046_4
# 1046| m1046_6(unknown) = ^CallSideEffect : ~m1045_19
# 1046| m1046_7(unknown) = Chi : total:m1045_19, partial:m1046_6
# 1046| m1046_6(unknown) = ^CallSideEffect : ~m1045_21
# 1046| m1046_7(unknown) = Chi : total:m1045_21, partial:m1046_6
# 1046| v1046_8(void) = ^IndirectReadSideEffect[-1] : &:r1046_2, ~m1046_7
# 1047| r1047_1(glval<decltype([...](...){...})>) = VariableAddress[lambda_ref_explicit] :
# 1047| r1047_2(glval<decltype([...](...){...})>) = VariableAddress[#temp1047:29] :
Expand All @@ -9588,21 +9600,27 @@ ir.cpp:
# 1049| m1049_4(unknown) = Chi : total:m1048_7, partial:m1049_3
# 1049| r1049_5(glval<String>) = FieldAddress[s] : r1049_2
# 1049| r1049_6(glval<unknown>) = FunctionAddress[String] :
# 1049| v1049_7(void) = Call[String] : func:r1049_6, this:r1049_5
# 1049| m1049_8(unknown) = ^CallSideEffect : ~m1049_4
# 1049| m1049_9(unknown) = Chi : total:m1049_4, partial:m1049_8
# 1049| m1049_10(String) = ^IndirectMayWriteSideEffect[-1] : &:r1049_5
# 1049| m1049_11(unknown) = Chi : total:m1049_9, partial:m1049_10
# 1049| r1049_12(decltype([...](...){...})) = Load[#temp1049:29] : &:r1049_2, ~m1049_11
# 1049| m1049_13(decltype([...](...){...})) = Store[lambda_val_explicit] : &:r1049_1, r1049_12
# 1049| m1049_14(unknown) = Chi : total:m1049_11, partial:m1049_13
# 1049| r1049_7(glval<String &>) = VariableAddress :
# 1049| r1049_8(String &) = Load[?] : &:r1049_7, ~m1049_4
#-----| r0_8(glval<String>) = CopyValue : r1049_8
#-----| r0_9(glval<String>) = ConvertToVirtualBase[String : String] : r0_8
#-----| r0_10(String &) = CopyValue : r0_9
# 1049| v1049_9(void) = Call[String] : func:r1049_6, this:r1049_5, 0:r0_10
# 1049| m1049_10(unknown) = ^CallSideEffect : ~m1049_4
# 1049| m1049_11(unknown) = Chi : total:m1049_4, partial:m1049_10
#-----| v0_11(void) = ^BufferReadSideEffect[0] : &:r0_10, ~m1049_11
# 1049| m1049_12(String) = ^IndirectMayWriteSideEffect[-1] : &:r1049_5
# 1049| m1049_13(unknown) = Chi : total:m1049_11, partial:m1049_12
# 1049| r1049_14(decltype([...](...){...})) = Load[#temp1049:29] : &:r1049_2, ~m1049_13
# 1049| m1049_15(decltype([...](...){...})) = Store[lambda_val_explicit] : &:r1049_1, r1049_14
# 1049| m1049_16(unknown) = Chi : total:m1049_13, partial:m1049_15
# 1050| r1050_1(glval<decltype([...](...){...})>) = VariableAddress[lambda_val_explicit] :
# 1050| r1050_2(glval<decltype([...](...){...})>) = Convert : r1050_1
# 1050| r1050_3(glval<unknown>) = FunctionAddress[operator()] :
# 1050| r1050_4(float) = Constant[4.0] :
# 1050| r1050_5(char) = Call[operator()] : func:r1050_3, this:r1050_2, 0:r1050_4
# 1050| m1050_6(unknown) = ^CallSideEffect : ~m1049_14
# 1050| m1050_7(unknown) = Chi : total:m1049_14, partial:m1050_6
# 1050| m1050_6(unknown) = ^CallSideEffect : ~m1049_16
# 1050| m1050_7(unknown) = Chi : total:m1049_16, partial:m1050_6
# 1050| v1050_8(void) = ^IndirectReadSideEffect[-1] : &:r1050_2, ~m1050_7
# 1051| r1051_1(glval<decltype([...](...){...})>) = VariableAddress[lambda_mixed_explicit] :
# 1051| r1051_2(glval<decltype([...](...){...})>) = VariableAddress[#temp1051:31] :
Expand Down
Loading