Make TypeChecker's Context and Diags fields private #28152
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
Flip things so rather than storing a TypeChecker and asking for the ASTContext when needed, store an ASTContext, and ask for a TypeChecker when needed.
|
@swift-ci please smoke test |
CodaFi
reviewed
Nov 9, 2019
| @@ -556,6 +553,9 @@ class TypeChecker final { | |||
| std::vector<AbstractClosureExpr *> ClosuresWithUncomputedCaptures; | |||
|
|
|||
| private: | |||
| ASTContext &Context; | |||
| DiagnosticEngine &Diags; | |||
There was a problem hiding this comment.
How much work would it be to remove Diags altogether?
There was a problem hiding this comment.
@CodaFi Ah nice, there's only one use. I'll remove it future PR :)
CodaFi
reviewed
Nov 9, 2019
| @@ -3658,7 +3676,7 @@ bool TypeChecker::isAvailabilitySafeForConformance( | |||
| } | |||
|
|
|||
| void TypeChecker::typeCheckDecl(Decl *D) { | |||
| DeclChecker(*this).visit(D); | |||
There was a problem hiding this comment.
typeCheckDecl can be static. That should remove some other type checker dependencies in the constraint system.
There was a problem hiding this comment.
@CodaFi Yup, I'm planning on sinking all of the getLegacyGlobalTypeChecker calls down to the places where we actually access the remaining type checker state. Thanks for the review!
CodaFi
approved these changes
Nov 9, 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.
Remove the remaining external uses of TypeChecker's
Contextfield, and make it private along withDiags.Also remove TypeChecker fields from a few walkers, flipping things such that instead of storing a TypeChecker and asking for the ASTContext when needed, store an ASTContext, and ask for a TypeChecker when needed.