Skip to content

Commit ee1f9a6

Browse files
committed
unified: Fix MaD for Argument[self]
1 parent d539a41 commit ee1f9a6

3 files changed

Lines changed: 8 additions & 2 deletions

File tree

‎unified/ql/lib/codeql/unified/internal/dataflow/ParameterPositions.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ParameterPosition extends TParameterPosition {
2323

2424
/** Gets the operand to `Parameter`/`Argument` that represents this position in a MaD model. */
2525
string asModelOperand() {
26-
this.isReceiver() and result = "receiver"
26+
this.isReceiver() and result = "self"
2727
or
2828
this.isCallee() and result = "callee"
2929
or

‎unified/ql/test/library-tests/dataflow/flow-summaries.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@ func t10() {
7474
func t11() {
7575
let t = TestType()
7676
t.setField(source("t11.1"))
77-
sink(t.getField()) // $ MISSING: hasValueFlow=t11.1
77+
sink(t.getField()) // $ hasValueFlow=t11.1
7878
}

‎unified/ql/test/library-tests/dataflow/test.expected‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,8 @@ edges
238238
| flow-summaries.swift:69:23:69:24 | & ... | flow-summaries.swift:69:19:69:20 | [post] & ... | provenance | |
239239
| flow-summaries.swift:69:23:69:24 | [post] & ... | flow-summaries.swift:71:10:71:10 | y | provenance | |
240240
| flow-summaries.swift:69:24:69:24 | y | flow-summaries.swift:69:23:69:24 | & ... | provenance | |
241+
| flow-summaries.swift:76:16:76:30 | source(...) | flow-summaries.swift:77:10:77:10 | t [field] | provenance | |
242+
| flow-summaries.swift:77:10:77:10 | t [field] | flow-summaries.swift:77:10:77:21 | ... .getField(...) | provenance | |
241243
| implicit-self.swift:16:9:16:12 | [post] self [x] | implicit-self.swift:17:14:17:17 | self [x] | provenance | |
242244
| implicit-self.swift:16:9:16:14 | ... .x | implicit-self.swift:16:9:16:12 | [post] self [x] | provenance | |
243245
| implicit-self.swift:16:18:16:31 | source(...) | implicit-self.swift:16:9:16:14 | ... .x | provenance | |
@@ -728,6 +730,9 @@ nodes
728730
| flow-summaries.swift:69:24:69:24 | y | semmle.label | y |
729731
| flow-summaries.swift:70:10:70:10 | x | semmle.label | x |
730732
| flow-summaries.swift:71:10:71:10 | y | semmle.label | y |
733+
| flow-summaries.swift:76:16:76:30 | source(...) | semmle.label | source(...) |
734+
| flow-summaries.swift:77:10:77:10 | t [field] | semmle.label | t [field] |
735+
| flow-summaries.swift:77:10:77:21 | ... .getField(...) | semmle.label | ... .getField(...) |
731736
| implicit-self.swift:16:9:16:12 | [post] self [x] | semmle.label | [post] self [x] |
732737
| implicit-self.swift:16:9:16:14 | ... .x | semmle.label | ... .x |
733738
| implicit-self.swift:16:18:16:31 | source(...) | semmle.label | source(...) |
@@ -1072,6 +1077,7 @@ testFailures
10721077
| flow-summaries.swift:70:10:70:10 | x | flow-summaries.swift:66:13:66:27 | source(...) | flow-summaries.swift:70:10:70:10 | x | $@ | flow-summaries.swift:66:13:66:27 | source(...) | source(...) |
10731078
| flow-summaries.swift:71:10:71:10 | y | flow-summaries.swift:65:13:65:27 | source(...) | flow-summaries.swift:71:10:71:10 | y | $@ | flow-summaries.swift:65:13:65:27 | source(...) | source(...) |
10741079
| flow-summaries.swift:71:10:71:10 | y | flow-summaries.swift:66:13:66:27 | source(...) | flow-summaries.swift:71:10:71:10 | y | $@ | flow-summaries.swift:66:13:66:27 | source(...) | source(...) |
1080+
| flow-summaries.swift:77:10:77:21 | ... .getField(...) | flow-summaries.swift:76:16:76:30 | source(...) | flow-summaries.swift:77:10:77:21 | ... .getField(...) | $@ | flow-summaries.swift:76:16:76:30 | source(...) | source(...) |
10751081
| implicit-self.swift:17:14:17:19 | ... .x | implicit-self.swift:16:18:16:31 | source(...) | implicit-self.swift:17:14:17:19 | ... .x | $@ | implicit-self.swift:16:18:16:31 | source(...) | source(...) |
10761082
| implicit-self.swift:23:14:23:14 | x | implicit-self.swift:22:13:22:26 | source(...) | implicit-self.swift:23:14:23:14 | x | $@ | implicit-self.swift:22:13:22:26 | source(...) | source(...) |
10771083
| implicit-self.swift:29:14:29:19 | ... .x | implicit-self.swift:28:13:28:26 | source(...) | implicit-self.swift:29:14:29:19 | ... .x | $@ | implicit-self.swift:28:13:28:26 | source(...) | source(...) |

0 commit comments

Comments
 (0)