Fix CFG for range loop

This commit is contained in:
Owen Mansel-Chan
2026-05-28 16:27:11 +01:00
parent 481564668d
commit bee9ead570

View File

@@ -1195,11 +1195,13 @@ module GoCfg {
private predicate rangeLoop(PreControlFlowNode n1, PreControlFlowNode n2) {
exists(Go::RangeStmt s |
// Use the shared library's auto-created `[LoopHeader]` additional node
// (created for every `LoopStmt`) as the join/branch point of the range loop.
n1.isBefore(s) and n2.isBefore(s.getDomain())
or
n1.isAfter(s.getDomain()) and n2.isIn(s)
n1.isAfter(s.getDomain()) and n2.isAdditional(s, "[LoopHeader]")
or
n1.isIn(s) and
n1.isAdditional(s, "[LoopHeader]") and
(
n2.isBefore(s.getKey())
or
@@ -1215,9 +1217,9 @@ module GoCfg {
or
n1.isAfter(s.getValue()) and n2.isBefore(s.getBody())
or
n1.isAfter(s.getBody()) and n2.isIn(s)
n1.isAfter(s.getBody()) and n2.isAdditional(s, "[LoopHeader]")
or
n1.isIn(s) and n2.isAfter(s)
n1.isAdditional(s, "[LoopHeader]") and n2.isAfter(s)
)
}