[libSyntax] Fix a crash that happened when parsing an invalid type #18022
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 |
rintaro
reviewed
Jul 18, 2018
lib/Parse/ParseType.cpp
Outdated
| @@ -1181,10 +1181,17 @@ Parser::parseTypeOptional(TypeRepr *base) { | |||
| llvm::Optional<TypeSyntax> SyntaxNode; | |||
| if (SyntaxContext->isEnabled()) { | |||
| OptionalTypeSyntaxBuilder Builder(Context.getSyntaxArena()); | |||
There was a problem hiding this comment.
Could you move this into if branch? The order shouldn't matter here.
lib/Parse/ParseType.cpp
Outdated
| SyntaxNode.emplace(Builder.build()); | ||
| auto QuestionMark = SyntaxContext->popToken(); | ||
| auto WrappedType = SyntaxContext->popIf<TypeSyntax>(); | ||
| if (WrappedType.hasValue()) { |
There was a problem hiding this comment.
if (auto WrappedType = SyntaxContext->popIf<TypeSyntax>()) {should work.
There was a problem hiding this comment.
Oh that's great. I always thought that the if (auto …) syntax only worked for pointers.
ahoppen
force-pushed
the
invalid-type-fix
branch
from
cf075d6 to
53dfecd
Compare
|
@swift-ci Please smoke test |
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.
When parsing an invalid type like
[Stri?ng], the syntax parser would crash because it was trying to build anOptionalTypebut the second entry on the stack was noTypeSyntaxbut aTokenSyntax.Fix this by checking if the second next node on the parsing stack is a
TypeSyntaxand if not, just push the nodes back onto the stack so that they can later be gathered into an unknown node.