Skip to content

Commit 9706171

Browse files
MathiasVPMathiasVP
committed
C++: Accept test output
1 parent 291df97 commit 9706171

File tree

6 files changed

+112
-98
lines changed

6 files changed

+112
-98
lines changed

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

Lines changed: 87 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -4731,85 +4731,93 @@ ir.cpp:
47314731

47324732
# 959| void OperatorNewArray(int)
47334733
# 959| Block 0
4734-
# 959| v959_1(void) = EnterFunction :
4735-
# 959| mu959_2(unknown) = AliasedDefinition :
4736-
# 959| mu959_3(unknown) = InitializeNonLocal :
4737-
# 959| mu959_4(unknown) = UnmodeledDefinition :
4738-
# 959| r959_5(glval<int>) = VariableAddress[n] :
4739-
# 959| mu959_6(int) = InitializeParameter[n] : &:r959_5
4740-
# 960| r960_1(glval<unknown>) = FunctionAddress[operator new[]] :
4741-
# 960| r960_2(unsigned long) = Constant[40] :
4742-
# 960| r960_3(void *) = Call : func:r960_1, 0:r960_2
4743-
# 960| mu960_4(unknown) = ^CallSideEffect : ~mu959_4
4744-
# 960| r960_5(int *) = Convert : r960_3
4745-
# 961| r961_1(glval<unknown>) = FunctionAddress[operator new[]] :
4746-
# 961| r961_2(glval<int>) = VariableAddress[n] :
4747-
# 961| r961_3(int) = Load : &:r961_2, ~mu959_4
4748-
# 961| r961_4(unsigned long) = Convert : r961_3
4749-
# 961| r961_5(unsigned long) = Constant[4] :
4750-
# 961| r961_6(unsigned long) = Mul : r961_4, r961_5
4751-
# 961| r961_7(void *) = Call : func:r961_1, 0:r961_6
4752-
# 961| mu961_8(unknown) = ^CallSideEffect : ~mu959_4
4753-
# 961| r961_9(int *) = Convert : r961_7
4754-
# 962| r962_1(glval<unknown>) = FunctionAddress[operator new[]] :
4755-
# 962| r962_2(glval<int>) = VariableAddress[n] :
4756-
# 962| r962_3(int) = Load : &:r962_2, ~mu959_4
4757-
# 962| r962_4(unsigned long) = Convert : r962_3
4758-
# 962| r962_5(unsigned long) = Constant[4] :
4759-
# 962| r962_6(unsigned long) = Mul : r962_4, r962_5
4760-
# 962| r962_7(float) = Constant[1.0] :
4761-
# 962| r962_8(void *) = Call : func:r962_1, 0:r962_6, 1:r962_7
4762-
# 962| mu962_9(unknown) = ^CallSideEffect : ~mu959_4
4763-
# 962| r962_10(int *) = Convert : r962_8
4764-
# 963| r963_1(glval<unknown>) = FunctionAddress[operator new[]] :
4765-
# 963| r963_2(glval<int>) = VariableAddress[n] :
4766-
# 963| r963_3(int) = Load : &:r963_2, ~mu959_4
4767-
# 963| r963_4(unsigned long) = Convert : r963_3
4768-
# 963| r963_5(unsigned long) = Constant[8] :
4769-
# 963| r963_6(unsigned long) = Mul : r963_4, r963_5
4770-
# 963| r963_7(void *) = Call : func:r963_1, 0:r963_6
4771-
# 963| mu963_8(unknown) = ^CallSideEffect : ~mu959_4
4772-
# 963| r963_9(String *) = Convert : r963_7
4773-
# 964| r964_1(glval<unknown>) = FunctionAddress[operator new[]] :
4774-
# 964| r964_2(glval<int>) = VariableAddress[n] :
4775-
# 964| r964_3(int) = Load : &:r964_2, ~mu959_4
4776-
# 964| r964_4(unsigned long) = Convert : r964_3
4777-
# 964| r964_5(unsigned long) = Constant[256] :
4778-
# 964| r964_6(unsigned long) = Mul : r964_4, r964_5
4779-
# 964| r964_7(align_val_t) = Constant[128] :
4780-
# 964| r964_8(void *) = Call : func:r964_1, 0:r964_6, 1:r964_7
4781-
# 964| mu964_9(unknown) = ^CallSideEffect : ~mu959_4
4782-
# 964| r964_10(Overaligned *) = Convert : r964_8
4783-
# 965| r965_1(glval<unknown>) = FunctionAddress[operator new[]] :
4784-
# 965| r965_2(unsigned long) = Constant[2560] :
4785-
# 965| r965_3(align_val_t) = Constant[128] :
4786-
# 965| r965_4(float) = Constant[1.0] :
4787-
# 965| r965_5(void *) = Call : func:r965_1, 0:r965_2, 1:r965_3, 2:r965_4
4788-
# 965| mu965_6(unknown) = ^CallSideEffect : ~mu959_4
4789-
# 965| r965_7(Overaligned *) = Convert : r965_5
4790-
# 966| r966_1(glval<unknown>) = FunctionAddress[operator new[]] :
4791-
# 966| r966_2(glval<int>) = VariableAddress[n] :
4792-
# 966| r966_3(int) = Load : &:r966_2, ~mu959_4
4793-
# 966| r966_4(unsigned long) = Convert : r966_3
4794-
# 966| r966_5(unsigned long) = Constant[1] :
4795-
# 966| r966_6(unsigned long) = Mul : r966_4, r966_5
4796-
# 966| r966_7(void *) = Call : func:r966_1, 0:r966_6
4797-
# 966| mu966_8(unknown) = ^CallSideEffect : ~mu959_4
4798-
# 966| r966_9(DefaultCtorWithDefaultParam *) = Convert : r966_7
4799-
# 967| r967_1(glval<unknown>) = FunctionAddress[operator new[]] :
4800-
# 967| r967_2(glval<int>) = VariableAddress[n] :
4801-
# 967| r967_3(int) = Load : &:r967_2, ~mu959_4
4802-
# 967| r967_4(unsigned long) = Convert : r967_3
4803-
# 967| r967_5(unsigned long) = Constant[4] :
4804-
# 967| r967_6(unsigned long) = Mul : r967_4, r967_5
4805-
# 967| r967_7(void *) = Call : func:r967_1, 0:r967_6
4806-
# 967| mu967_8(unknown) = ^CallSideEffect : ~mu959_4
4807-
# 967| r967_9(int *) = Convert : r967_7
4808-
# 968| v968_1(void) = NoOp :
4809-
# 959| v959_7(void) = ReturnVoid :
4810-
# 959| v959_8(void) = UnmodeledUse : mu*
4811-
# 959| v959_9(void) = AliasedUse : ~mu959_4
4812-
# 959| v959_10(void) = ExitFunction :
4734+
# 959| v959_1(void) = EnterFunction :
4735+
# 959| mu959_2(unknown) = AliasedDefinition :
4736+
# 959| mu959_3(unknown) = InitializeNonLocal :
4737+
# 959| mu959_4(unknown) = UnmodeledDefinition :
4738+
# 959| r959_5(glval<int>) = VariableAddress[n] :
4739+
# 959| mu959_6(int) = InitializeParameter[n] : &:r959_5
4740+
# 960| r960_1(glval<unknown>) = FunctionAddress[operator new[]] :
4741+
# 960| r960_2(unsigned long) = Constant[40] :
4742+
# 960| r960_3(void *) = Call : func:r960_1, 0:r960_2
4743+
# 960| mu960_4(unknown) = ^CallSideEffect : ~mu959_4
4744+
# 960| mu960_5(unknown) = ^InitializeDynamicAllocation : &:r960_3
4745+
# 960| r960_6(int *) = Convert : r960_3
4746+
# 961| r961_1(glval<unknown>) = FunctionAddress[operator new[]] :
4747+
# 961| r961_2(glval<int>) = VariableAddress[n] :
4748+
# 961| r961_3(int) = Load : &:r961_2, ~mu959_4
4749+
# 961| r961_4(unsigned long) = Convert : r961_3
4750+
# 961| r961_5(unsigned long) = Constant[4] :
4751+
# 961| r961_6(unsigned long) = Mul : r961_4, r961_5
4752+
# 961| r961_7(void *) = Call : func:r961_1, 0:r961_6
4753+
# 961| mu961_8(unknown) = ^CallSideEffect : ~mu959_4
4754+
# 961| mu961_9(unknown) = ^InitializeDynamicAllocation : &:r961_7
4755+
# 961| r961_10(int *) = Convert : r961_7
4756+
# 962| r962_1(glval<unknown>) = FunctionAddress[operator new[]] :
4757+
# 962| r962_2(glval<int>) = VariableAddress[n] :
4758+
# 962| r962_3(int) = Load : &:r962_2, ~mu959_4
4759+
# 962| r962_4(unsigned long) = Convert : r962_3
4760+
# 962| r962_5(unsigned long) = Constant[4] :
4761+
# 962| r962_6(unsigned long) = Mul : r962_4, r962_5
4762+
# 962| r962_7(float) = Constant[1.0] :
4763+
# 962| r962_8(void *) = Call : func:r962_1, 0:r962_6, 1:r962_7
4764+
# 962| mu962_9(unknown) = ^CallSideEffect : ~mu959_4
4765+
# 962| mu962_10(unknown) = ^InitializeDynamicAllocation : &:r962_8
4766+
# 962| r962_11(int *) = Convert : r962_8
4767+
# 963| r963_1(glval<unknown>) = FunctionAddress[operator new[]] :
4768+
# 963| r963_2(glval<int>) = VariableAddress[n] :
4769+
# 963| r963_3(int) = Load : &:r963_2, ~mu959_4
4770+
# 963| r963_4(unsigned long) = Convert : r963_3
4771+
# 963| r963_5(unsigned long) = Constant[8] :
4772+
# 963| r963_6(unsigned long) = Mul : r963_4, r963_5
4773+
# 963| r963_7(void *) = Call : func:r963_1, 0:r963_6
4774+
# 963| mu963_8(unknown) = ^CallSideEffect : ~mu959_4
4775+
# 963| mu963_9(unknown) = ^InitializeDynamicAllocation : &:r963_7
4776+
# 963| r963_10(String *) = Convert : r963_7
4777+
# 964| r964_1(glval<unknown>) = FunctionAddress[operator new[]] :
4778+
# 964| r964_2(glval<int>) = VariableAddress[n] :
4779+
# 964| r964_3(int) = Load : &:r964_2, ~mu959_4
4780+
# 964| r964_4(unsigned long) = Convert : r964_3
4781+
# 964| r964_5(unsigned long) = Constant[256] :
4782+
# 964| r964_6(unsigned long) = Mul : r964_4, r964_5
4783+
# 964| r964_7(align_val_t) = Constant[128] :
4784+
# 964| r964_8(void *) = Call : func:r964_1, 0:r964_6, 1:r964_7
4785+
# 964| mu964_9(unknown) = ^CallSideEffect : ~mu959_4
4786+
# 964| mu964_10(unknown) = ^InitializeDynamicAllocation : &:r964_8
4787+
# 964| r964_11(Overaligned *) = Convert : r964_8
4788+
# 965| r965_1(glval<unknown>) = FunctionAddress[operator new[]] :
4789+
# 965| r965_2(unsigned long) = Constant[2560] :
4790+
# 965| r965_3(align_val_t) = Constant[128] :
4791+
# 965| r965_4(float) = Constant[1.0] :
4792+
# 965| r965_5(void *) = Call : func:r965_1, 0:r965_2, 1:r965_3, 2:r965_4
4793+
# 965| mu965_6(unknown) = ^CallSideEffect : ~mu959_4
4794+
# 965| mu965_7(unknown) = ^InitializeDynamicAllocation : &:r965_5
4795+
# 965| r965_8(Overaligned *) = Convert : r965_5
4796+
# 966| r966_1(glval<unknown>) = FunctionAddress[operator new[]] :
4797+
# 966| r966_2(glval<int>) = VariableAddress[n] :
4798+
# 966| r966_3(int) = Load : &:r966_2, ~mu959_4
4799+
# 966| r966_4(unsigned long) = Convert : r966_3
4800+
# 966| r966_5(unsigned long) = Constant[1] :
4801+
# 966| r966_6(unsigned long) = Mul : r966_4, r966_5
4802+
# 966| r966_7(void *) = Call : func:r966_1, 0:r966_6
4803+
# 966| mu966_8(unknown) = ^CallSideEffect : ~mu959_4
4804+
# 966| mu966_9(unknown) = ^InitializeDynamicAllocation : &:r966_7
4805+
# 966| r966_10(DefaultCtorWithDefaultParam *) = Convert : r966_7
4806+
# 967| r967_1(glval<unknown>) = FunctionAddress[operator new[]] :
4807+
# 967| r967_2(glval<int>) = VariableAddress[n] :
4808+
# 967| r967_3(int) = Load : &:r967_2, ~mu959_4
4809+
# 967| r967_4(unsigned long) = Convert : r967_3
4810+
# 967| r967_5(unsigned long) = Constant[4] :
4811+
# 967| r967_6(unsigned long) = Mul : r967_4, r967_5
4812+
# 967| r967_7(void *) = Call : func:r967_1, 0:r967_6
4813+
# 967| mu967_8(unknown) = ^CallSideEffect : ~mu959_4
4814+
# 967| mu967_9(unknown) = ^InitializeDynamicAllocation : &:r967_7
4815+
# 967| r967_10(int *) = Convert : r967_7
4816+
# 968| v968_1(void) = NoOp :
4817+
# 959| v959_7(void) = ReturnVoid :
4818+
# 959| v959_8(void) = UnmodeledUse : mu*
4819+
# 959| v959_9(void) = AliasedUse : ~mu959_4
4820+
# 959| v959_10(void) = ExitFunction :
48134821

48144822
# 970| int designatedInit()
48154823
# 970| Block 0

‎cpp/ql/test/library-tests/ir/ssa/aliased_ssa_ir.expected

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,17 +1162,19 @@ ssa.cpp:
11621162
# 248| r248_8(void *) = Call : func:r248_2, 0:r248_7
11631163
# 248| m248_9(unknown) = ^CallSideEffect : ~m247_10
11641164
# 248| m248_10(unknown) = Chi : total:m247_10, partial:m248_9
1165-
# 248| r248_11(char *) = Convert : r248_8
1166-
# 248| m248_12(char *) = Store : &:r248_1, r248_11
1165+
# 248| m248_11(unknown) = ^InitializeDynamicAllocation : &:r248_8
1166+
# 248| m248_12(unknown) = Chi : total:m248_10, partial:m248_11
1167+
# 248| r248_13(char *) = Convert : r248_8
1168+
# 248| m248_14(char *) = Store : &:r248_1, r248_13
11671169
# 249| r249_1(char) = Constant[97] :
11681170
# 249| r249_2(glval<char *>) = VariableAddress[src] :
11691171
# 249| r249_3(char *) = Load : &:r249_2, m247_7
11701172
# 249| r249_4(glval<char>) = CopyValue : r249_3
11711173
# 249| m249_5(char) = Store : &:r249_4, r249_1
1172-
# 249| m249_6(unknown) = Chi : total:m248_10, partial:m249_5
1174+
# 249| m249_6(unknown) = Chi : total:m248_12, partial:m249_5
11731175
# 250| r250_1(glval<unknown>) = FunctionAddress[memcpy] :
11741176
# 250| r250_2(glval<char *>) = VariableAddress[dst] :
1175-
# 250| r250_3(char *) = Load : &:r250_2, m248_12
1177+
# 250| r250_3(char *) = Load : &:r250_2, m248_14
11761178
# 250| r250_4(void *) = Convert : r250_3
11771179
# 250| r250_5(glval<char *>) = VariableAddress[src] :
11781180
# 250| r250_6(char *) = Load : &:r250_5, m247_7
@@ -1185,7 +1187,7 @@ ssa.cpp:
11851187
# 250| m250_13(unknown) = Chi : total:m249_6, partial:m250_12
11861188
# 251| r251_1(glval<char *>) = VariableAddress[#return] :
11871189
# 251| r251_2(glval<char *>) = VariableAddress[dst] :
1188-
# 251| r251_3(char *) = Load : &:r251_2, m248_12
1190+
# 251| r251_3(char *) = Load : &:r251_2, m248_14
11891191
# 251| m251_4(char *) = Store : &:r251_1, r251_3
11901192
# 247| v247_13(void) = ReturnIndirection : &:r247_8, ~m250_13
11911193
# 247| r247_14(glval<char *>) = VariableAddress[#return] :

0 commit comments

Comments
 (0)