NFC: Clean up WhereClauseOwner #28123
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
|
Ugh, formatting conflicts |
CodaFi
reviewed
Nov 7, 2019
lib/Sema/TypeCheckAccess.cpp
Outdated
| @@ -379,9 +379,9 @@ void AccessControlCheckerBase::checkGenericParamAccess( | |||
| auto diagID = diag::generic_param_usable_from_inline; | |||
| if (downgradeToWarning == DowngradeToWarning::Yes) | |||
| diagID = diag::generic_param_usable_from_inline_warn; | |||
| auto diag = TC.diagnose(owner, | |||
| auto diag = TC.diagnose(ownerDecl, | |||
There was a problem hiding this comment.
Actually, this will fall out of the merge conflict resolution...
There was a problem hiding this comment.
Indeed, I've spotted it now.
AnthonyLatsis
changed the title
AnthonyLatsis
force-pushed
the
whereclauseowner-cleanup
branch
from
3704ba6 to
63562cc
Compare
|
@swift-ci please smoke test |
|
🤔 |
AnthonyLatsis
force-pushed
the
whereclauseowner-cleanup
branch
from
63562cc to
db423e7
Compare
|
Found the culprit, let's go again. |
|
@swift-ci please smoke test |
DougGregor
approved these changes
Nov 8, 2019
|
⛵️ |
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.
@slavapestov
Midquel for #23489
Apart from the clean up, this will allow us to properly pass a
GenericContextrather than just a Decl. As far as I see directly passing aTrailingWhereClauseis not an option, becauseWhereClauseOwnerneeds a realDeclContext.