ClangImporter: simplify logic for mutability attribute #61500
Merged
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
|
@swift-ci please test Windows platform |
Take the spellings for the attributes as parameters for the diagnostics to allow us to reference the ignored the attribute properly. Use direct pointer checks instead of an unnecessary `llvm::Optional` around a nullable pointer. Use `llvm::StringRef` to simplify the comparison. This avoids re-spelling the attribute parameters which have already been checked by `isMutabilityAttr` for the contradiction.
|
@swift-ci please test Windows platform |
etcwilde
reviewed
Oct 7, 2022
|
Okay, so |
etcwilde
approved these changes
Oct 8, 2022
There was a problem hiding this comment.
Okay, I'm more confident in this approval now. The original diagnostic appears to have been misleading since it only pointed at the non-mutating attribute, but didn't change anything else. The replacement patch doesn't affect the setting of seenMutabilityAttr vs swiftAttr compared the original code.
|
@swift-ci please smoke test |
|
@swift-ci please test |
|
CC: @zoecarver @egorzhdan |
|
The Windows failure is due to Interop/Cxx/class/mutability-annotations-typechecker.swift which was addressed by #61512 |
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.
Take the spellings for the attributes as parameters for the diagnostics to allow us to reference the ignored the attribute properly. Use direct pointer checks instead of an unnecessary
llvm::Optionalaround a nullable pointer. Usellvm::StringRefto simplify the comparison. This avoids re-spelling the attribute parameters which have already been checked byisMutabilityAttrfor the contradiction.