Swift: add SetContent for data flow #13838
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
geoffw0
reviewed
Jul 31, 2023
|
Also small nitpick: How about just calling this |
I like this idea. |
geoffw0
reviewed
Aug 3, 2023
| cs.isSingleton(c) and | ||
| result = "EnumElement[" + c.getSignature() + "]" | ||
| ) | ||
| or |
There was a problem hiding this comment.
Thanks for adding this, I missed it in #13795 .
geoffw0
reviewed
Aug 3, 2023
|
|
||
| let set2 = Set([source()]) | ||
| sink(arg: set2.randomElement()!) // $ MISSING: flow=703 | ||
| sink(arg: set2.randomElement()!) // $ flow=706 |
|
Do you mind rebasing this on the latest main so that we get a smaller diff @rdmarsh2? |
MathiasVP
reviewed
Aug 4, 2023
| @@ -255,7 +255,8 @@ private module Cached { | |||
| TFieldContent(FieldDecl f) or | |||
| TTupleContent(int index) { exists(any(TupleExpr te).getElement(index)) } or | |||
| TEnumContent(ParamDecl f) { exists(EnumElementDecl d | d.getAParam() = f) } or | |||
| TArrayContent() | |||
| TArrayContent() or | |||
| TSetContent() | |||
There was a problem hiding this comment.
I still think we should call this CollectionContent (see #13838 (comment))
3bcf28e
to
024c5cf
Compare
geoffw0
reviewed
Aug 4, 2023
|
|
||
| /** An element of a set */ | ||
| class CollectionContent extends Content, TCollectionContent { | ||
| override string toString() { result = "Set element" } |
There was a problem hiding this comment.
Suggested change
| override string toString() { result = "Set element" } | |
| override string toString() { result = "Collection element" } |
| @@ -492,6 +492,9 @@ predicate parseContent(AccessPathToken component, Content content) { | |||
| or | |||
| component.getName() = "ArrayElement" and | |||
| content instanceof Content::ArrayContent | |||
| or | |||
| component.getName() = "SetElement" and | |||
There was a problem hiding this comment.
Should this be CollectionElement as well?
Suggested change
| component.getName() = "SetElement" and | |
| component.getName() = "CollectionElement" and |
| @@ -224,6 +224,11 @@ module Content { | |||
| class ArrayContent extends Content, TArrayContent { | |||
| override string toString() { result = "Array element" } | |||
| } | |||
|
|
|||
| /** An element of a set */ | |||
There was a problem hiding this comment.
Suggested change
| /** An element of a set */ | |
| /** An element of a collection. */ |
| or | ||
| exists(Content::CollectionContent c | | ||
| cs.isSingleton(c) and | ||
| result = "SetElement" |
There was a problem hiding this comment.
Suggested change
| result = "SetElement" | |
| result = "CollectionElement" |
| @@ -26,6 +26,8 @@ private class CollectionSummaries extends SummaryModelCsv { | |||
| ";Collection;true;split(separator:maxSplits:omittingEmptySubsequences:);;;Argument[-1];ReturnValue;taint", | |||
| ";Collection;true;removeFirst();;;Argument[-1];ReturnValue;taint", | |||
| ";Collection;true;popFirst();;;Argument[-1];ReturnValue;taint", | |||
| ";Collection;true;randomElement();;;Argument[-1].SetElement;ReturnValue.OptionalSome;value", | |||
There was a problem hiding this comment.
Suggested change
| ";Collection;true;randomElement();;;Argument[-1].SetElement;ReturnValue.OptionalSome;value", | |
| ";Collection;true;randomElement();;;Argument[-1].CollectionElement;ReturnValue.OptionalSome;value", |
Comment on lines
+14
to
+17
| ";Set;true;insert(_:);;;Argument[-1].SetElement;ReturnValue.TupleElement[1];value", | ||
| ";Set;true;insert(_:);;;Argument[0];Argument[-1].SetElement;value", | ||
| ";Set;true;insert(_:);;;Argument[0];ReturnValue.TupleElement[1];value", | ||
| ";Set;true;init(_:);;;Argument[0].ArrayElement;ReturnValue.SetElement;value" |
There was a problem hiding this comment.
Suggested change
| ";Set;true;insert(_:);;;Argument[-1].SetElement;ReturnValue.TupleElement[1];value", | |
| ";Set;true;insert(_:);;;Argument[0];Argument[-1].SetElement;value", | |
| ";Set;true;insert(_:);;;Argument[0];ReturnValue.TupleElement[1];value", | |
| ";Set;true;init(_:);;;Argument[0].ArrayElement;ReturnValue.SetElement;value" | |
| ";Set;true;insert(_:);;;Argument[-1].CollectionElement;ReturnValue.TupleElement[1];value", | |
| ";Set;true;insert(_:);;;Argument[0];Argument[-1].CollectionElement;value", | |
| ";Set;true;insert(_:);;;Argument[0];ReturnValue.TupleElement[1];value", | |
| ";Set;true;init(_:);;;Argument[0].ArrayElement;ReturnValue.CollectionElement;value" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.