Skip to content

Commit be12649

Browse files
committed
Swift: Update joined models for Swift 6.
1 parent 6f0f739 commit be12649

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Collection.qll

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ private class CollectionSummaries extends SummaryModelCsv {
4343
";BidirectionalCollection;true;dropLast(_:);;;Argument[-1];ReturnValue;taint",
4444
";BidirectionalCollection;true;dropLast(_:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value",
4545
";BidirectionalCollection;true;joined(separator:);;;Argument[-1..0];ReturnValue;taint",
46+
";BidirectionalCollection;true;joined(separator:);;;Argument[-1].CollectionElement;ReturnValue;taint",
47+
";BidirectionalCollection;true;joined(separator:);;;Argument[-1].CollectionElement.CollectionElement;ReturnValue.CollectionElement;value",
4648
";BidirectionalCollection;true;last(where:);;;Argument[-1];ReturnValue;taint",
4749
";BidirectionalCollection;true;popLast();;;Argument[-1];ReturnValue;taint",
4850
";BidirectionalCollection;true;reversed();;;Argument[-1];ReturnValue;taint",

swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Sequence.qll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ private class SequenceSummaries extends SummaryModelCsv {
4545
";Sequence;true;joined();;;Argument[-1].CollectionElement.CollectionElement;ReturnValue.CollectionElement;value",
4646
";Sequence;true;joined(separator:);;;Argument[0..-1];ReturnValue;taint",
4747
";Sequence;true;joined(separator:);;;Argument[-1].CollectionElement;ReturnValue;taint",
48+
";Sequence;true;joined(separator:);;;Argument[-1].CollectionElement.CollectionElement;ReturnValue.CollectionElement;value",
4849
";Sequence;true;first(where:);;;Argument[-1].CollectionElement;ReturnValue;value",
4950
";Sequence;true;withContiguousStorageIfAvailable(_:);;;Argument[-1];Argument[0].Parameter[0].CollectionElement;taint",
5051
";Sequence;true;withContiguousStorageIfAvailable(_:);;;Argument[-1].CollectionElement;Argument[0].Parameter[0].CollectionElement;value",

swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.expected

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
testFailures
22
| optionset.swift:60:49:61:1 | // $ tainted=60\n | Missing result: tainted=60 |
33
| optionset.swift:65:58:66:1 | // $ tainted=65\n | Missing result: tainted=65 |
4-
| string.swift:270:40:271:1 | // $ tainted=217\n | Missing result: tainted=217 |
5-
| string.swift:271:40:272:1 | // $ tainted=217\n | Missing result: tainted=217 |
6-
| string.swift:272:42:273:1 | // $ tainted=217\n | Missing result: tainted=217 |
74
| string.swift:586:19:587:1 | // $ tainted=565\n | Missing result: tainted=565 |
85
| string.swift:587:27:588:1 | // $ tainted=565\n | Missing result: tainted=565 |
96
| string.swift:599:35:600:1 | // $ tainted=599\n | Missing result: tainted=599 |

0 commit comments

Comments
 (0)