Skip to content

Commit 6f38769

Browse files
committed
Swift: rename SetContent to CollectionContent
1 parent 024c5cf commit 6f38769

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

swift/ql/lib/codeql/swift/dataflow/ExternalFlow.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ predicate parseContent(AccessPathToken component, Content content) {
494494
content instanceof Content::ArrayContent
495495
or
496496
component.getName() = "SetElement" and
497-
content instanceof Content::SetContent
497+
content instanceof Content::CollectionContent
498498
}
499499

500500
cached

swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ private module Cached {
257257
TTupleContent(int index) { exists(any(TupleExpr te).getElement(index)) } or
258258
TEnumContent(ParamDecl f) { exists(EnumElementDecl d | d.getAParam() = f) } or
259259
TArrayContent() or
260-
TSetContent()
260+
TCollectionContent()
261261
}
262262

263263
/**
@@ -902,7 +902,7 @@ class DataFlowExpr = Expr;
902902
* Holds if access paths with `c` at their head always should be tracked at high
903903
* precision. This disables adaptive access path precision for such access paths.
904904
*/
905-
predicate forceHighPrecision(Content c) { c instanceof Content::ArrayContent or c instanceof Content::SetContent }
905+
predicate forceHighPrecision(Content c) { c instanceof Content::ArrayContent or c instanceof Content::CollectionContent }
906906

907907
/**
908908
* Holds if the node `n` is unreachable when the call context is `call`.

swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPublic.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ module Content {
226226
}
227227

228228
/** An element of a set */
229-
class SetContent extends Content, TSetContent {
229+
class CollectionContent extends Content, TCollectionContent {
230230
override string toString() { result = "Set element" }
231231
}
232232
}

swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImplSpecific.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ private string getContentSpecific(ContentSet cs) {
120120
result = "ArrayElement"
121121
)
122122
or
123-
exists(Content::SetContent c |
123+
exists(Content::CollectionContent c |
124124
cs.isSingleton(c) and
125125
result = "SetElement"
126126
)

0 commit comments

Comments
 (0)