Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 17f76c2

Browse files
author
Dave Bartolomeo
committed
C++: Fix merge conflicts
1 parent 6c1d219 commit 17f76c2

2 files changed

Lines changed: 51 additions & 0 deletions

File tree

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -877,3 +877,29 @@ ssa.cpp:
877877
# 207| v0_27(void) = UnmodeledUse : mu*
878878
# 207| v0_28(void) = AliasedUse : ~m0_1
879879
# 207| v0_29(void) = ExitFunction :
880+
881+
# 215| char StringLiteralAliasing()
882+
# 215| Block 0
883+
# 215| v0_0(void) = EnterFunction :
884+
# 215| m0_1(unknown) = AliasedDefinition :
885+
# 215| mu0_2(unknown) = UnmodeledDefinition :
886+
# 216| r0_3(glval<unknown>) = FunctionAddress[ExternalFunc] :
887+
# 216| v0_4(void) = Call : func:r0_3
888+
# 216| m0_5(unknown) = ^CallSideEffect : ~m0_1
889+
# 216| m0_6(unknown) = Chi : total:m0_1, partial:m0_5
890+
# 218| r0_7(glval<char *>) = VariableAddress[s] :
891+
# 218| r0_8(glval<char[8]>) = StringConstant["Literal"] :
892+
# 218| r0_9(char *) = Convert : r0_8
893+
# 218| m0_10(char *) = Store : &:r0_7, r0_9
894+
# 219| r0_11(glval<char>) = VariableAddress[#return] :
895+
# 219| r0_12(glval<char *>) = VariableAddress[s] :
896+
# 219| r0_13(char *) = Load : &:r0_12, m0_10
897+
# 219| r0_14(int) = Constant[2] :
898+
# 219| r0_15(glval<char>) = PointerAdd[1] : r0_13, r0_14
899+
# 219| r0_16(char) = Load : &:r0_15, ~m0_1
900+
# 219| m0_17(char) = Store : &:r0_11, r0_16
901+
# 215| r0_18(glval<char>) = VariableAddress[#return] :
902+
# 215| v0_19(void) = ReturnValue : &:r0_18, m0_17
903+
# 215| v0_20(void) = UnmodeledUse : mu*
904+
# 215| v0_21(void) = AliasedUse : ~m0_6
905+
# 215| v0_22(void) = ExitFunction :

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -841,3 +841,28 @@ ssa.cpp:
841841
# 207| v0_24(void) = UnmodeledUse : mu*
842842
# 207| v0_25(void) = AliasedUse : ~mu0_2
843843
# 207| v0_26(void) = ExitFunction :
844+
845+
# 215| char StringLiteralAliasing()
846+
# 215| Block 0
847+
# 215| v0_0(void) = EnterFunction :
848+
# 215| mu0_1(unknown) = AliasedDefinition :
849+
# 215| mu0_2(unknown) = UnmodeledDefinition :
850+
# 216| r0_3(glval<unknown>) = FunctionAddress[ExternalFunc] :
851+
# 216| v0_4(void) = Call : func:r0_3
852+
# 216| mu0_5(unknown) = ^CallSideEffect : ~mu0_2
853+
# 218| r0_6(glval<char *>) = VariableAddress[s] :
854+
# 218| r0_7(glval<char[8]>) = StringConstant["Literal"] :
855+
# 218| r0_8(char *) = Convert : r0_7
856+
# 218| m0_9(char *) = Store : &:r0_6, r0_8
857+
# 219| r0_10(glval<char>) = VariableAddress[#return] :
858+
# 219| r0_11(glval<char *>) = VariableAddress[s] :
859+
# 219| r0_12(char *) = Load : &:r0_11, m0_9
860+
# 219| r0_13(int) = Constant[2] :
861+
# 219| r0_14(glval<char>) = PointerAdd[1] : r0_12, r0_13
862+
# 219| r0_15(char) = Load : &:r0_14, ~mu0_2
863+
# 219| m0_16(char) = Store : &:r0_10, r0_15
864+
# 215| r0_17(glval<char>) = VariableAddress[#return] :
865+
# 215| v0_18(void) = ReturnValue : &:r0_17, m0_16
866+
# 215| v0_19(void) = UnmodeledUse : mu*
867+
# 215| v0_20(void) = AliasedUse : ~mu0_2
868+
# 215| v0_21(void) = ExitFunction :

0 commit comments

Comments
 (0)