Skip to content

Commit baa4c50

Browse files
committed
Use location of control flow root for EntryNode
1 parent 561a681 commit baa4c50

File tree

6 files changed

+82
-84
lines changed

6 files changed

+82
-84
lines changed

go/ql/lib/semmle/go/controlflow/ControlFlowGraphImpl.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,9 +440,7 @@ class EntryNode extends ControlFlow::Node, MkEntryNode {
440440
override predicate hasLocationInfo(
441441
string filepath, int startline, int startcolumn, int endline, int endcolumn
442442
) {
443-
root.hasLocationInfo(filepath, startline, startcolumn, _, _) and
444-
endline = startline and
445-
endcolumn = startcolumn
443+
root.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
446444
}
447445
}
448446

go/ql/test/extractor-tests/go1.17/CFG.expected

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ nodes
22
edges
33
| conversions.go:0:0:0:0 | entry | conversions.go:3:1:3:15 | skip |
44
| conversions.go:3:1:3:15 | skip | conversions.go:5:6:5:8 | skip |
5-
| conversions.go:5:1:5:1 | entry | conversions.go:5:10:5:10 | argument corresponding to _ |
5+
| conversions.go:5:1:5:29 | entry | conversions.go:5:10:5:10 | argument corresponding to _ |
66
| conversions.go:5:1:5:29 | function declaration | conversions.go:7:6:7:9 | skip |
77
| conversions.go:5:6:5:8 | skip | conversions.go:5:1:5:29 | function declaration |
88
| conversions.go:5:10:5:10 | argument corresponding to _ | conversions.go:5:10:5:10 | initialization of _ |
99
| conversions.go:5:10:5:10 | initialization of _ | conversions.go:5:28:5:29 | skip |
1010
| conversions.go:5:28:5:29 | skip | conversions.go:5:29:5:29 | exit |
11-
| conversions.go:7:1:7:1 | entry | conversions.go:8:6:8:6 | skip |
11+
| conversions.go:7:1:26:1 | entry | conversions.go:8:6:8:6 | skip |
1212
| conversions.go:7:1:26:1 | function declaration | conversions.go:0:0:0:0 | exit |
1313
| conversions.go:7:6:7:9 | skip | conversions.go:7:1:26:1 | function declaration |
1414
| conversions.go:8:6:8:6 | assignment to a | conversions.go:10:2:10:2 | skip |

0 commit comments

Comments
 (0)