hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-07-31 23:42:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix return edges

Browse Source
This commit is contained in:
Owen Mansel-Chan
2026-06-29 14:43:20 +01:00
parent 4aaf7353a4
commit 80ee8402c1
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
go/ql/lib/semmle/go/controlflow/ControlFlowGraphShared.qll
View File

@@ -801,13 +801,10 @@ module GoCfg {
ast = fd.getBody() and
not funcHasDefer(fd) and
c.getSuccessorType() instanceof ReturnSuccessor and
(
// If the function has result variables, route the return completion
// through the result-read epilogue before reaching the function exit.
exists(fd.getResultVar(0)) and n.isAdditional(fd.getBody(), "result-read:0")
or
not exists(fd.getResultVar(_)) and n.isAfter(fd.getBody())
)
// If the function has result variables, route the return completion
// through the result-read epilogue before reaching the function exit.
exists(fd.getResultVar(0)) and
n.isAdditional(fd.getBody(), "result-read:0")
)
or
exists(Go::LabeledStmt lbl, Go::FuncDef fd |
@@ -1731,7 +1728,13 @@ module GoCfg {
private predicate funcDefBodyStart(Go::FuncDef fd, PreControlFlowNode n) {
n.isBefore(getRankedChild(fd.getBody(), 1))
or
not exists(getRankedChild(fd.getBody(), _)) and n.isAfter(fd.getBody())
not exists(getRankedChild(fd.getBody(), _)) and
n.isAfter(fd.getBody()) and
// When Before(body) and After(body) are the same node (the shared library's
// "simple leaf node" optimization merges them for empty bodies without
// additional nodes), don't generate Before→After as it would be a self-loop.
// The callable exit mechanism already routes After(body) → NormalExit.
not n.isBefore(fd.getBody())
}
private predicate funcDefBodyStep(Go::FuncDef fd, PreControlFlowNode n1, PreControlFlowNode n2) {