From da26b4f856f2c15b08cc60043988461966b252e9 Mon Sep 17 00:00:00 2001 From: Jonas Jensen Date: Thu, 22 Nov 2018 13:52:33 +0100 Subject: [PATCH] C++: Accept test changes for IR This test was failing due to a semantic merge conflict between #509, which added `UninitializedInstruction`, and #517, which added new test code that would get `UninitializedInstruction`s in it after merging with #509. --- .../ir/ir/aliased_ssa_ir.expected | 23 ++++++++++--------- .../test/library-tests/ir/ir/raw_ir.expected | 23 ++++++++++--------- .../ir/ir/unaliased_ssa_ir.expected | 23 ++++++++++--------- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/cpp/ql/test/library-tests/ir/ir/aliased_ssa_ir.expected b/cpp/ql/test/library-tests/ir/ir/aliased_ssa_ir.expected index 2c870437cf5a..ab7f7ae43cb0 100644 --- a/cpp/ql/test/library-tests/ir/ir/aliased_ssa_ir.expected +++ b/cpp/ql/test/library-tests/ir/ir/aliased_ssa_ir.expected @@ -4,17 +4,18 @@ bad_asts.cpp: # 14| v0_0(void) = EnterFunction : # 14| mu0_1(unknown) = UnmodeledDefinition : # 15| r0_2(glval) = VariableAddress[s] : -# 15| r0_3(glval) = FieldAddress[x] : r0_2 -# 15| r0_4(int) = Constant[0] : -# 15| mu0_5(int) = Store : r0_3, r0_4 -# 16| r0_6(glval) = VariableAddress[s] : -# 16| r0_7(glval) = FunctionAddress[MemberFunction] : -# 16| r0_8(int) = Constant[1] : -# 16| r0_9(int) = Call : r0_7, this:r0_6, r0_8 -# 17| v0_10(void) = NoOp : -# 14| v0_11(void) = ReturnVoid : -# 14| v0_12(void) = UnmodeledUse : mu* -# 14| v0_13(void) = ExitFunction : +# 15| mu0_3(S) = Uninitialized : r0_2 +# 15| r0_4(glval) = FieldAddress[x] : r0_2 +# 15| r0_5(int) = Constant[0] : +# 15| mu0_6(int) = Store : r0_4, r0_5 +# 16| r0_7(glval) = VariableAddress[s] : +# 16| r0_8(glval) = FunctionAddress[MemberFunction] : +# 16| r0_9(int) = Constant[1] : +# 16| r0_10(int) = Call : r0_8, this:r0_7, r0_9 +# 17| v0_11(void) = NoOp : +# 14| v0_12(void) = ReturnVoid : +# 14| v0_13(void) = UnmodeledUse : mu* +# 14| v0_14(void) = ExitFunction : # 22| Bad::Point::Point() -> void # 22| Block 0 diff --git a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected index ec1b170e5adb..15f3f0867ac0 100644 --- a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected +++ b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected @@ -4,17 +4,18 @@ bad_asts.cpp: # 14| v0_0(void) = EnterFunction : # 14| mu0_1(unknown) = UnmodeledDefinition : # 15| r0_2(glval) = VariableAddress[s] : -# 15| r0_3(glval) = FieldAddress[x] : r0_2 -# 15| r0_4(int) = Constant[0] : -# 15| mu0_5(int) = Store : r0_3, r0_4 -# 16| r0_6(glval) = VariableAddress[s] : -# 16| r0_7(glval) = FunctionAddress[MemberFunction] : -# 16| r0_8(int) = Constant[1] : -# 16| r0_9(int) = Call : r0_7, this:r0_6, r0_8 -# 17| v0_10(void) = NoOp : -# 14| v0_11(void) = ReturnVoid : -# 14| v0_12(void) = UnmodeledUse : mu* -# 14| v0_13(void) = ExitFunction : +# 15| mu0_3(S) = Uninitialized : r0_2 +# 15| r0_4(glval) = FieldAddress[x] : r0_2 +# 15| r0_5(int) = Constant[0] : +# 15| mu0_6(int) = Store : r0_4, r0_5 +# 16| r0_7(glval) = VariableAddress[s] : +# 16| r0_8(glval) = FunctionAddress[MemberFunction] : +# 16| r0_9(int) = Constant[1] : +# 16| r0_10(int) = Call : r0_8, this:r0_7, r0_9 +# 17| v0_11(void) = NoOp : +# 14| v0_12(void) = ReturnVoid : +# 14| v0_13(void) = UnmodeledUse : mu* +# 14| v0_14(void) = ExitFunction : # 22| Bad::Point::Point() -> void # 22| Block 0 diff --git a/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_ir.expected b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_ir.expected index 5ceea60d50da..8aa58507f263 100644 --- a/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_ir.expected +++ b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_ir.expected @@ -4,17 +4,18 @@ bad_asts.cpp: # 14| v0_0(void) = EnterFunction : # 14| mu0_1(unknown) = UnmodeledDefinition : # 15| r0_2(glval) = VariableAddress[s] : -# 15| r0_3(glval) = FieldAddress[x] : r0_2 -# 15| r0_4(int) = Constant[0] : -# 15| mu0_5(int) = Store : r0_3, r0_4 -# 16| r0_6(glval) = VariableAddress[s] : -# 16| r0_7(glval) = FunctionAddress[MemberFunction] : -# 16| r0_8(int) = Constant[1] : -# 16| r0_9(int) = Call : r0_7, this:r0_6, r0_8 -# 17| v0_10(void) = NoOp : -# 14| v0_11(void) = ReturnVoid : -# 14| v0_12(void) = UnmodeledUse : mu* -# 14| v0_13(void) = ExitFunction : +# 15| mu0_3(S) = Uninitialized : r0_2 +# 15| r0_4(glval) = FieldAddress[x] : r0_2 +# 15| r0_5(int) = Constant[0] : +# 15| mu0_6(int) = Store : r0_4, r0_5 +# 16| r0_7(glval) = VariableAddress[s] : +# 16| r0_8(glval) = FunctionAddress[MemberFunction] : +# 16| r0_9(int) = Constant[1] : +# 16| r0_10(int) = Call : r0_8, this:r0_7, r0_9 +# 17| v0_11(void) = NoOp : +# 14| v0_12(void) = ReturnVoid : +# 14| v0_13(void) = UnmodeledUse : mu* +# 14| v0_14(void) = ExitFunction : # 22| Bad::Point::Point() -> void # 22| Block 0