[IDE] Fix SyntaxModel crash due to out-of-order walking of EnumElementDecls #26270
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 test |
|
@swift-ci please stress test |
…tDecls ModelASTWalker was previously constructing SyntaxNodes for EnumElementDecls manually when visiting their associated EnumCaseDecl so that they would appear as children rather than siblings. It wasn't actually walking these nodes though, so missed handling some things, e.g. closures passed as default argument values. These were also still being visited later, and because the first visit consumed all the associated TokenNodes, this was triggering an assertion due to the associated TokenNodes not matching expectations.
nathawes
force-pushed
the
53313197-syntaxmodel-crash
branch
from
c2b7d92 to
218f490
Compare
|
@swift-ci please test |
|
Build failed |
|
Build failed |
Assert 0 and return a default kind, rather than calling unreachable as a defensive fix for rdar://problem/53343735.
|
@swift-ci please test |
|
Build failed |
|
Build failed |
|
@swift-ci please test OS X Platform |
akyrtzi
approved these changes
Jul 23, 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.
ModelASTWalkerwas previously constructingSyntaxNodes forEnumElementDecls manually when visiting their associatedEnumCaseDeclso that they would appear as its children rather than its siblings. It wasn't actually walking these nodes though, so missed handling some things, e.g. closures passed as default argument values. It was also still walking the sameEnumElementDecls again in the sibling position. Because theTokenNodes in the range of eachEnumElementDeclwere consumed when they were manually constructed, this second visit was triggering some recently added assertions in the handling of custom attributes, which expected the correspondingTokenNodes to still be present.Resolves rdar://problem/53313197