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

Skip to content

Commit eb55d96

Browse files
committed
C++: Fix semantic merge conflict
This test output must have been wrong because I produced it with an extractor that didn't have #2153 applied.
1 parent 751263d commit eb55d96

1 file changed

Lines changed: 24 additions & 0 deletions

File tree

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
11
bad_asts.cpp:
2+
# 9| int Bad::S::MemberFunction<int 6>(int)
3+
# 9| Block 0
4+
# 9| v0_0(void) = EnterFunction :
5+
# 9| mu0_1(unknown) = AliasedDefinition :
6+
# 9| mu0_2(unknown) = UnmodeledDefinition :
7+
# 9| r0_3(glval<S>) = InitializeThis :
8+
# 9| r0_4(glval<int>) = VariableAddress[y] :
9+
# 9| mu0_5(int) = InitializeParameter[y] : &:r0_4
10+
# 10| r0_6(glval<int>) = VariableAddress[#return] :
11+
# 10| r0_7(int) = Constant[6] :
12+
#-----| r0_8(S *) = CopyValue : r0_3
13+
# 10| r0_9(glval<int>) = FieldAddress[x] : r0_8
14+
# 10| r0_10(int) = Load : &:r0_9, ~mu0_2
15+
# 10| r0_11(int) = Add : r0_7, r0_10
16+
# 10| r0_12(glval<int>) = VariableAddress[y] :
17+
# 10| r0_13(int) = Load : &:r0_12, ~mu0_2
18+
# 10| r0_14(int) = Add : r0_11, r0_13
19+
# 10| mu0_15(int) = Store : &:r0_6, r0_14
20+
# 9| r0_16(glval<int>) = VariableAddress[#return] :
21+
# 9| v0_17(void) = ReturnValue : &:r0_16, ~mu0_2
22+
# 9| v0_18(void) = UnmodeledUse : mu*
23+
# 9| v0_19(void) = AliasedUse : ~mu0_2
24+
# 9| v0_20(void) = ExitFunction :
25+
226
# 14| void Bad::CallBadMemberFunction()
327
# 14| Block 0
428
# 14| v0_0(void) = EnterFunction :

0 commit comments

Comments
 (0)