hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19177 from aschackmull/swift/ssa-useuse

Browse Source 
Swift: Update SSA to reference the new use-use predicates.
This commit is contained in:
Anders Schack-Mulligen
2025-04-03 09:46:47 +02:00
committed by GitHub
parent bb15f30ef6 e1ef56b8bb
commit e04075b0ec
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
swift/ql/lib/codeql/swift/dataflow/Ssa.qll
View File

@@ -151,25 +151,24 @@ module Ssa {
cached
ControlFlowNode getAFirstRead() {
exists(SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2 |
this.definesAt(_, bb1, i1) and
SsaImpl::adjacentDefRead(this, bb1, i1, bb2, i2) and
result = bb2.getNode(i2)
exists(SsaInput::BasicBlock bb, int i |
SsaImpl::firstUse(this, bb, i, true) and
result = bb.getNode(i)
)
}
cached
predicate adjacentReadPair(ControlFlowNode read1, ControlFlowNode read2) {
read1 = this.getARead() and
exists(SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2 |
read1 = bb1.getNode(i1) and
SsaInput::variableRead(bb1, i1, _, true) and
SsaImpl::adjacentDefRead(this, bb1, i1, bb2, i2) and
SsaImpl::adjacentUseUse(bb1, i1, bb2, i2, _, true) and
read2 = bb2.getNode(i2)
)
}
cached
predicate lastRefRedef(SsaInput::BasicBlock bb, int i, Definition next) {
deprecated predicate lastRefRedef(SsaInput::BasicBlock bb, int i, Definition next) {
SsaImpl::lastRefRedef(this, bb, i, next)
}
}

6
swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
View File

@@ -111,10 +111,8 @@ private class CaptureNodeImpl extends CaptureNode, NodeImpl {
}
private predicate localFlowSsaInput(Node nodeFrom, Ssa::Definition def, Ssa::Definition next) {
exists(BasicBlock bb, int i | def.lastRefRedef(bb, i, next) |
def.definesAt(_, bb, i) and
def = nodeFrom.asDefinition()
)
next.(Ssa::PhiDefinition).getAPhiInput() = def and
def = nodeFrom.asDefinition()
}
/** A collection of cached types and predicates to be evaluated in the same stage. */

3
swift/ql/test/library-tests/dataflow/dataflow/DataFlow.expected
View File

@@ -172,6 +172,7 @@ edges
| test.swift:6:19:6:26 | call to source() | test.swift:7:15:7:15 | t1 | provenance | |
| test.swift:6:19:6:26 | call to source() | test.swift:9:15:9:15 | t1 | provenance | |
| test.swift:6:19:6:26 | call to source() | test.swift:10:15:10:15 | t2 | provenance | |
| test.swift:6:19:6:26 | call to source() | test.swift:15:15:15:15 | t2 | provenance | |
| test.swift:25:20:25:27 | call to source() | test.swift:29:18:29:21 | x | provenance | |
| test.swift:26:26:26:33 | call to source() | test.swift:29:26:29:29 | y | provenance | |
| test.swift:29:18:29:21 | x | test.swift:30:15:30:15 | x | provenance | |
@@ -964,6 +965,7 @@ nodes
| test.swift:7:15:7:15 | t1 | semmle.label | t1 |
| test.swift:9:15:9:15 | t1 | semmle.label | t1 |
| test.swift:10:15:10:15 | t2 | semmle.label | t2 |
| test.swift:15:15:15:15 | t2 | semmle.label | t2 |
| test.swift:25:20:25:27 | call to source() | semmle.label | call to source() |
| test.swift:26:26:26:33 | call to source() | semmle.label | call to source() |
| test.swift:29:18:29:21 | x | semmle.label | x |
@@ -1706,6 +1708,7 @@ subpaths
| test.swift:7:15:7:15 | t1 | test.swift:6:19:6:26 | call to source() | test.swift:7:15:7:15 | t1 | result |
| test.swift:9:15:9:15 | t1 | test.swift:6:19:6:26 | call to source() | test.swift:9:15:9:15 | t1 | result |
| test.swift:10:15:10:15 | t2 | test.swift:6:19:6:26 | call to source() | test.swift:10:15:10:15 | t2 | result |
| test.swift:15:15:15:15 | t2 | test.swift:6:19:6:26 | call to source() | test.swift:15:15:15:15 | t2 | result |
| test.swift:30:15:30:15 | x | test.swift:25:20:25:27 | call to source() | test.swift:30:15:30:15 | x | result |
| test.swift:31:15:31:15 | y | test.swift:26:26:26:33 | call to source() | test.swift:31:15:31:15 | y | result |
| test.swift:39:15:39:29 | call to callee_source() | test.swift:35:12:35:19 | call to source() | test.swift:39:15:39:29 | call to callee_source() | result |

2
swift/ql/test/library-tests/dataflow/dataflow/LocalFlow.expected
View File

@@ -250,11 +250,13 @@
| test.swift:7:15:7:15 | [post] t1 | test.swift:8:10:8:10 | t1 |
| test.swift:7:15:7:15 | t1 | test.swift:8:10:8:10 | t1 |
| test.swift:8:5:8:10 | SSA def(t2) | test.swift:10:15:10:15 | t2 |
| test.swift:8:5:8:10 | SSA def(t2) | test.swift:15:5:15:5 | SSA phi(t2) |
| test.swift:8:10:8:10 | t1 | test.swift:8:5:8:10 | SSA def(t2) |
| test.swift:8:10:8:10 | t1 | test.swift:9:15:9:15 | t1 |
| test.swift:9:15:9:15 | [post] t1 | test.swift:11:8:11:8 | t1 |
| test.swift:9:15:9:15 | t1 | test.swift:11:8:11:8 | t1 |
| test.swift:12:9:12:14 | SSA def(t2) | test.swift:13:19:13:19 | t2 |
| test.swift:12:9:12:14 | SSA def(t2) | test.swift:15:5:15:5 | SSA phi(t2) |
| test.swift:12:14:12:14 | 0 | test.swift:12:9:12:14 | SSA def(t2) |
| test.swift:15:5:15:5 | SSA phi(t2) | test.swift:15:15:15:15 | t2 |
| test.swift:17:5:17:10 | SSA def(t1) | test.swift:21:15:21:15 | t1 |

2
swift/ql/test/library-tests/dataflow/dataflow/test.swift
View File

@@ -12,7 +12,7 @@ func intraprocedural_with_local_flow() -> Void {
t2 = 0
sink(arg: t2)
}
sink(arg: t2) // $ MISSING: flow=6
sink(arg: t2) // $ flow=6
t1 = 0;
while(false) {