Skip to content

Commit 1e7dced

Browse files
C++: Fix semantic merge conflict
1 parent 283991d commit 1e7dced

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6782,7 +6782,7 @@ ir.cpp:
67826782
# 1055| 0: i
67836783
# 1055| Type = int
67846784
# 1055| ValueCategory = prvalue(load)
6785-
# 1058| chiNodeAtEndOfLoop(int, char *) -> void
6785+
# 1058| void chiNodeAtEndOfLoop(int, char*)
67866786
# 1058| params:
67876787
# 1058| 0: n
67886788
# 1058| Type = int

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4647,7 +4647,7 @@ ir.cpp:
46474647
# 1049| Block 2
46484648
# 1049| v2_0(void) = Unreached :
46494649

4650-
# 1058| chiNodeAtEndOfLoop(int, char *) -> void
4650+
# 1058| void chiNodeAtEndOfLoop(int, char*)
46514651
# 1058| Block 0
46524652
# 1058| v0_0(void) = EnterFunction :
46534653
# 1058| m0_1(unknown) = AliasedDefinition :

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4545,7 +4545,7 @@ ir.cpp:
45454545
# 1049| v2_6(void) = UnmodeledUse : mu*
45464546
# 1049| v2_7(void) = ExitFunction :
45474547

4548-
# 1058| chiNodeAtEndOfLoop(int, char *) -> void
4548+
# 1058| void chiNodeAtEndOfLoop(int, char*)
45494549
# 1058| Block 0
45504550
# 1058| v0_0(void) = EnterFunction :
45514551
# 1058| mu0_1(unknown) = AliasedDefinition :

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4518,7 +4518,7 @@ ir.cpp:
45184518
# 1049| Block 2
45194519
# 1049| v2_0(void) = Unreached :
45204520

4521-
# 1058| chiNodeAtEndOfLoop(int, char *) -> void
4521+
# 1058| void chiNodeAtEndOfLoop(int, char*)
45224522
# 1058| Block 0
45234523
# 1058| v0_0(void) = EnterFunction :
45244524
# 1058| mu0_1(unknown) = AliasedDefinition :

0 commit comments

Comments
 (0)