[4.0] Collected fixes #8970
Merged
[4.0] Collected fixes #8970
Conversation
This file contains hidden or 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
When the type checker forms a GenericSignatureBuilder to process requirements, the GSB may look up concrete conformances. Route such requests through TypeChecker::conformsToProtocol() so they can be marked as used. This fixes multi-file scenarios where conformances from another file might be used only in a generic signature in the primary file, e.g., rdar://problem/31759258. (cherry picked from commit 449aa2f)
…ense. Fixes an error emitted on declarations imported from Objective-C, rdar://problem/31776315. (cherry picked from commit facf199)
…tribute. No part of the compiler, including the Clang importer, should synthesize an attribute that would fail early attribute validation. When it happens, it would emit diagnostics with no location information, which is really annoyingly hard to debug. Instead, assert that this doesn't happen, i.e., both that the Clang importer doesn't synthesize bogus attributes (as in the previous commit) and that nothing synthesizes such attributes with empty source location informations. In non-asserting builds, just suppress the diagnostic. (cherry picked from commit 25ce6fa)
ASan found this amusing stack-use-after-scope problem in the AST
that's been around for a long while. It was introduced when
`ModuleDecl::lookupConformance()` changed from returning an
llvm::PointerIntPair<ProtocolConformance *, 2>
to an
Optional<ProtocolConformanceRef>
In the former, `getPointer()` grabbed the `ProtocolConformance*`, which
was fine. In the latter, it produced a `ProtocolConformanceRef*`
pointing into a temporary value.
Fixes rdar://problem/31708629.
(cherry picked from commit 47987cb)
We can get partially-validated ASTs when they are created by the Clang importer, but not otherwise needed or after new code can be introduced. Avoid doing the "checked" verification on such ASTs, to make assertions-enabled builds more useful for testing. This is the wrong long-term solution: the AST verifier should tolerate partially-type-checked ASTs at a finer granularity, but doing so is a larger project than I can take on at the moment. (cherry picked from commit 2c32f72)
|
@swift-ci please test and merge |
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.
A collection of varied fixes for the 4.0 branch:
GenericSignatureBuilderneeds them. Fixes rdar://problem/31759258ibactionattributes from Objective-C methods to their Swift counterparts if it doesn't make sense for Swift. Fixes rdar://problem/31776315