[ClangImporter] Prefer available enum elements over unavailable ones. #6990
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
Don't bail out early when there's no deprecated-as-unavailable mode; we also use the loop to check for `availability(swift, unavailable)`. No test because the only callers are for Objective-C declarations.
The function is a callback parameter that does not escape, therefore function_ref is the right choice. No functionality change.
...and avoid making aliases from one unavailable declaration to another. If it's unavailable, we can just import it as a normal case and not worry about it. This fixes an issue where Sema would try to diagnose the body of an "alias" for referring to unavailable declarations. (Background: enum cases in Swift have to have unique values, so we import any duplicate values as static properties. Pattern matching logic has a hack to recognize these particular static properties as being "case-like".) This commit also sinks enum element uniqueness checking into importing the enum, instead of keeping a global map we never consult again. This should save a small bit of memory. rdar://problem/30025723
DougGregor
approved these changes
Jan 26, 2017
| @@ -1792,6 +1792,26 @@ applyPropertyOwnership(VarDecl *prop, | |||
| } | |||
|
|
|||
| namespace { | |||
| /// Customized llvm::DenseMapInfo for storing borrowed APSInts. | |||
There was a problem hiding this comment.
This is very... clever...alright.
There was a problem hiding this comment.
It's probably not even necessary, but it's not worse than what was there before, and it's boxed up pretty neatly.
jrose-apple
added a commit
to jrose-apple/swift
that referenced
this pull request
Jan 26, 2017
…r-than-unavailable [ClangImporter] Prefer available enum elements over unavailable ones.
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.
...and avoid making aliases from one unavailable declaration to another. If it's unavailable, we can just import it as a normal case and not worry about it. This fixes an issue where Sema would try to diagnose the body of an "alias" for referring to unavailable declarations.
(Background: enum cases in Swift have to have unique values, so we import any duplicate values as static properties. Pattern matching logic has a hack to recognize these particular static properties as being "case-like".)
This commit also sinks enum element uniqueness checking into importing the enum, instead of keeping a global map we never consult again. This should save a small bit of memory.
rdar://problem/30025723
I stuck two other cleanup commits in here as well; they should have no change in behavior.