Push FunctionTypeRepr Input Invariants Up #17191
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
|
@swift-ci please smoke test |
CodaFi
commented
Jun 14, 2018
include/swift/AST/TypeRepr.h
Outdated
| @@ -465,60 +465,6 @@ inline IdentTypeRepr::ComponentRange IdentTypeRepr::getComponentRange() { | |||
| return ComponentRange(this); | |||
| } | |||
|
|
|||
| /// \brief A function type. | |||
There was a problem hiding this comment.
Note to self: Moving this below TupleTypeRepr might be a mistake. I should probably forward-declare and move the things accessing TupleTypeRepr into TypeRepr.cpp
jrose-apple
reviewed
Jun 14, 2018
| @@ -1461,7 +1461,7 @@ class PlaceholderExpansionScanner { | |||
| bool walkToTypeReprPre(TypeRepr *T) override { | |||
| if (auto *FTR = dyn_cast<FunctionTypeRepr>(T)) { | |||
| FoundFunctionTypeRepr = true; | |||
| if (auto *TTR = dyn_cast_or_null<TupleTypeRepr>(FTR->getArgsTypeRepr())) { | |||
| if (auto *TTR = FTR->getArgsTypeRepr()) { | |||
There was a problem hiding this comment.
This probably doesn't need to be an if at all now.
There was a problem hiding this comment.
It's the _or_null that's got me scared.
There was a problem hiding this comment.
I'm not sure how you'd ever get a FunctionTypeRepr with no argument types, but fair enough.
There was a problem hiding this comment.
It was probably defensive coding. If the tests pass without it I would just remove it.
CodaFi
commented
Jun 14, 2018
lib/IRGen/IRGenDebugInfo.cpp
Outdated
| @@ -889,7 +889,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo { | |||
| // throw it away before lowering. | |||
| else if (isa<GenericFunctionType>(BaseTy)) { | |||
| auto *fTy = cast<AnyFunctionType>(BaseTy); | |||
| auto *nongenericTy = FunctionType::get(fTy->getInput(), fTy->getResult(), | |||
| auto *nongenericTy = FunctionType::get(fTy->getParams(), fTy->getResult(), | |||
Validation of the input side of FunctionTypeRepr was previously being done in Sema because of expression folding. If we instead push the invariant that the input TypeRepr should always be a TupleTypeRepr into the AST a number of nice cleanups fall out: - The SIL Parser no longer accepts Swift 2-style type declarations - Parse is more cleanly able to reject invalid FunctionTypeReprs - Clients of the AST can be assured the input type is always a TupleType so we can flush Swift 2 hacks
slavapestov
approved these changes
Jun 14, 2018
|
@swift-ci please smoke test |
|
⛵️ @swift-ci please test and merge |
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.
Validation of the input side of FunctionTypeRepr was previously being done in Sema because of expression folding. If we instead push the invariant that the input TypeRepr should always be a TupleTypeRepr into the AST a number of nice cleanups fall out: