[ModuleInterface] Propagate availability for nested types too #25662
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
Previously the module interface printing would scrape the AvailableAttrs from the containing decl in order to print synthesized extensions for conformances that wouldn't otherwise be printed...but that missed the case where a containing lexical scope had the availability attributes instead. Now it walks up the chain of parent DeclContexts and collects the most specific AvailableAttr for each platform. This /still/ isn't formally correct because it doesn't merge availability for one platform (if something inside is deprecated unconditionally but outside has an "introduced" version), but it's going to match the vast majority of code out there. Pre-requisite for rdar://problem/50100142
|
@swift-ci Please test |
| // attributes for the same platform; formally they'd need to be merged. | ||
| bool alreadyHasMoreSpecificAttrForThisPlatform = | ||
| llvm::any_of(*cache, [nextAttr](const AvailableAttr *existingAttr) { | ||
| return existingAttr->Platform == nextAttr->Platform; |
There was a problem hiding this comment.
Does this rely on Sema diagnosing when an inner thing is available on an earlier platform than the outer thing?
There was a problem hiding this comment.
Yeah, it does. That'd be a weird thing to do, though, since it means you can use the type with one availability guard but you can't name it without a stricter one.
There was a problem hiding this comment.
Yeah, it doesn't make sense, but I wanted to make sure we were explicitly not verifying that the existing one is earlier than the inner one here. 👍
harlanhaskins
approved these changes
Jun 22, 2019
jrose-apple
added a commit
to jrose-apple/swift
that referenced
this pull request
Jun 24, 2019
…ang#25662) Previously the module interface printing would scrape the AvailableAttrs from the containing decl in order to print synthesized extensions for conformances that wouldn't otherwise be printed...but that missed the case where a containing lexical scope had the availability attributes instead. Now it walks up the chain of parent DeclContexts and collects the most specific AvailableAttr for each platform. This /still/ isn't formally correct because it doesn't merge availability for one platform (if something inside is deprecated unconditionally but outside has an "introduced" version), but it's going to match the vast majority of code out there. Pre-requisite for rdar://problem/50100142 (cherry picked from commit 15bcd23)
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.
Previously the module interface printing would scrape the AvailableAttrs from the containing decl in order to print synthesized extensions for conformances that wouldn't otherwise be printed...but that missed the case where a containing lexical scope had the availability attributes instead. Now it walks up the chain of parent DeclContexts and collects the most specific AvailableAttr for each platform.
This still isn't formally correct because it doesn't merge availability for one platform (if something inside is deprecated unconditionally but outside has an "introduced" version), but it's going to match the vast majority of code out there.
Pre-requisite for rdar://problem/50100142 and #25650.