hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-01 11:45:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

C++: Fix semantic merge conflict

Browse Source
This commit is contained in:
Dave Bartolomeo
2019-02-07 14:32:26 -08:00
parent 283991d520
commit 1e7dcedcdf
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpp/ql/test/library-tests/ir/ir/PrintAST.expected
View File

@@ -6782,7 +6782,7 @@ ir.cpp:
# 1055| 0: i
# 1055| Type = int
# 1055| ValueCategory = prvalue(load)
# 1058| chiNodeAtEndOfLoop(int, char *) -> void
# 1058| void chiNodeAtEndOfLoop(int, char*)
# 1058| params:
# 1058| 0: n
# 1058| Type = int

2
cpp/ql/test/library-tests/ir/ir/aliased_ssa_ir.expected
View File

@@ -4647,7 +4647,7 @@ ir.cpp:
# 1049| Block 2
# 1049| v2_0(void) = Unreached :
# 1058| chiNodeAtEndOfLoop(int, char *) -> void
# 1058| void chiNodeAtEndOfLoop(int, char*)
# 1058| Block 0
# 1058| v0_0(void) = EnterFunction :
# 1058| m0_1(unknown) = AliasedDefinition :

2
cpp/ql/test/library-tests/ir/ir/raw_ir.expected
View File

@@ -4545,7 +4545,7 @@ ir.cpp:
# 1049| v2_6(void) = UnmodeledUse : mu*
# 1049| v2_7(void) = ExitFunction :
# 1058| chiNodeAtEndOfLoop(int, char *) -> void
# 1058| void chiNodeAtEndOfLoop(int, char*)
# 1058| Block 0
# 1058| v0_0(void) = EnterFunction :
# 1058| mu0_1(unknown) = AliasedDefinition :

2
cpp/ql/test/library-tests/ir/ir/unaliased_ssa_ir.expected
View File

@@ -4518,7 +4518,7 @@ ir.cpp:
# 1049| Block 2
# 1049| v2_0(void) = Unreached :
# 1058| chiNodeAtEndOfLoop(int, char *) -> void
# 1058| void chiNodeAtEndOfLoop(int, char*)
# 1058| Block 0
# 1058| v0_0(void) = EnterFunction :
# 1058| mu0_1(unknown) = AliasedDefinition :