Circular validation cleanups, part 6 #27594
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
slavapestov
force-pushed
the
circular-validation-cleanups-6
branch
2 times, most recently
from
05175c4 to
a7cc405
Compare
In preparation for landing the ResultTypeRequest, let's compute the result type directly from the declaration. For now, this still forces getInterfaceType() to be computed, but that will go away next.
…request validateDecl() no longer explicitly validates the result TypeLoc. Instead, the request is triggered via validateDecl() calling computeType() on the FuncDecl or SubscriptDecl.
This is not the right long term solution -- we need to compute this lazily using a request. But for now, let's stop computing it as a side effect of calling validateDecl().
Even if we haven't computed an interface type yet, we might still be able to compute one.
slavapestov
force-pushed
the
circular-validation-cleanups-6
branch
from
a7cc405 to
90fa96d
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please test source compatibility |
CodaFi
reviewed
Oct 11, 2019
| @@ -24,6 +24,7 @@ | |||
| #include "swift/AST/PrettyStackTrace.h" | |||
| #include "swift/AST/SubstitutionMap.h" | |||
| #include "swift/Sema/IDETypeChecking.h" | |||
| #include "swift/Subsystems.h" | |||
There was a problem hiding this comment.
I moved createTypeChecker() from IDETypeChecking.h (which is still used in this file) to Subsystems.h.
|
@swift-ci Please smoke test macOS |
|
@swift-ci Please test source compatibility Debug |
|
Source compat debug failure is due to UPASS (noticed it on one of my PRs as well) - someone needs to un-XFAIL it |
|
apple/swift-lldb#2057 |
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.
The epic follow-up to #27571.
The following methods used to get the interface type and extract the result type out of it:
This PR refactors them into requests which directly compute the type, with the exception of the last one which is so trivial it is not a request in itself.
This PR also eliminates all
computeType()methods, except for the one onAbstractFunctionDecl. We no longer eagerly compute the interface type of deserialized or imported declarations -- instead, its computed the first time we callsetInterfaceType(), just like with a parsed declaration (but generally we do less work; for example, for an imported or deserialized function, the interface types of the parameters and result should already be set;getInterfaceType()just assembles the final(Generic)FunctionType).