Swift: make extractor compilable with Swift 6 #17699
Conversation
|
@redsun82 Thank you for working on this; greatly appreciated! |
This reverts commit 34b8b43.
swift/ql/test/library-tests/dataflow/taint/core/TaintInline.expected
Outdated
Show resolved
Hide resolved
swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.expected
Outdated
Show resolved
Hide resolved
swift/ql/test/library-tests/dataflow/dataflow/DataFlowInline.expected
Outdated
Show resolved
Hide resolved
Swift: Update models for better Swift 6 compatibility.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| ";Collection;true;suffix(from:);;;Argument[-1];ReturnValue;taint", | ||
| ";Collection;true;suffix(_:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value", |
Check warning
Code scanning / CodeQL
Redundant assignment. Warning
There was a problem hiding this comment.
It wouldn't do any harm to fix these.
| ";BidirectionalCollection;true;suffix(_:);;;Argument[-1];ReturnValue;taint", | ||
| ";BidirectionalCollection;true;suffix(_:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value", | ||
| ";BidirectionalCollection;true;suffix(from:);;;Argument[-1];ReturnValue;taint", | ||
| ";BidirectionalCollection;true;suffix(_:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value", |
Check warning
Code scanning / CodeQL
Redundant assignment. Warning
Swift: Fix makeIterator() models
Swift: Fix for OptionSet and BinaryInteger models
Swift: extract variables as children of `ForEachStmt`
| import codeql.swift.elements.stmt.LabeledStmt | ||
| import codeql.swift.elements.pattern.Pattern | ||
| import codeql.swift.elements.decl.PatternBindingDecl | ||
| import codeql.swift.elements.decl.VarDecl |
Check warning
Code scanning / CodeQL
Redundant import Warning
| import codeql.swift.elements.stmt.internal.LabeledStmtImpl::Impl as LabeledStmtImpl | ||
| import codeql.swift.elements.pattern.Pattern | ||
| import codeql.swift.elements.decl.PatternBindingDecl | ||
| import codeql.swift.elements.decl.VarDecl |
Check warning
Code scanning / CodeQL
Redundant import Warning generated
There was a problem hiding this comment.
I've attempted to review this - the bazel stuff and most of the other wiring doesn't mean a lot to me, so I've tried to understand what I can and ask questions.
The tests, CI and DCA do give me a bit of confidence. I notice though:
- new extraction errors in the DCA run (though lower dataset check failures)
- slower extraction in the DCA run
- and possibly less data extracted for SideStore
I'd like to hear your thoughts on how serious those issues are and what if anything can be done about them?
swift/ql/test/extractor-tests/generated/stmt/ForEachStmt/ForEachStmt_getNextCall.expected
Show resolved
Hide resolved
In a normal situation, we would probably need to look at those more in detail. Right now we don't really have capacity for that, and I'm quite happy with the result as is (I honestly thought it would look worse). |
There was a problem hiding this comment.
In a normal situation, we would probably need to look at those more in detail. Right now we don't really have
capacity for that, and I'm quite happy with the result as is (I honestly thought it would look worse).
OK. I think we should follow up at least to the point of diagnosing the majority of new extractor errors next year. It's not severe enough it has to block this work.
There's a CI (test) failure but it looks like it only has to do with packs being out of sync.
This updates the Swift extractor to Swift release 6.0.2.
Unfortunately we had to drop support for running on Linux entirely for the time being, and some work further down the line will be required to support some new Swift 6 goodies in analysis.
This also contains updates to how we pull in pre-built artifacts in our build, shifting from
dsp-testing/codeql-swift-artifactsreleases to LFS files in here, but keeping a mechanism to usedsp-testing/codeql-swift-artifactsreleases for initial testing before committing the files to LFS. A good entry point to understand those changes is in theswift/third_party/resources/updating.mdfile.