Finish killing multiple parameter lists #18139
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
A better approach would be to split off ASTScopeKind::AbstractFunctionSelf from ASTScopeKind::AbstractFunctionParams, but for now, hack things up at the boundary to match the old behavior.
… subclasses Now, an AbstractFunctionDecl always stores a single parameter list. Furthermore, ConstructorDecl and DestructorDecl always store a ParamDecl for 'self'. FuncDecl only has a 'self' if it is a member of a nominal type or extension, so we tail-allocate the storage for it.
|
@swift-ci Please test |
|
@swift-ci Please test source compatibility |
slavapestov
commented
Jul 23, 2018
| @@ -617,27 +617,51 @@ ASTScope *ASTScope::createRoot(SourceFile *sourceFile) { | |||
| return scope; | |||
| } | |||
|
|
|||
| // FIXME: This is a vestige of multiple parameter lists. | |||
| static ParamDecl *getParameter(AbstractFunctionDecl *func, | |||
There was a problem hiding this comment.
@DougGregor I feel really guilty about this :( Sorry about that. I hope one of us finds time to work on ASTScope one day!
|
Build failed |
|
Build failed |
|
apple/swift-lldb#787 |
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.
Final installment in the series after #18128.
In a few places I had to hack things up a bit because the multiple parameter list and uncurry level terminology is so ingrained, in particular in CSDiag. We can clean this up later.
Fixes https://bugs.swift.org/browse/SR-5832.