[SR-165][Parser] Fix diagnosis location for missing while after repeat body #754
Conversation
This file contains 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
| if (body.isNonNull()) | ||
| return body; | ||
| return makeParserError(); | ||
| diagnose(body.getPtrOrNull()->getEndLoc(), diag::expected_while_after_repeat_body); |
There was a problem hiding this comment.
The previous code was careful to handle the "null" case for "body", while this code will crash if "body" is null.
There was a problem hiding this comment.
@DougGregor Yep, but look up a couple lines. There's already a check for body.isNull() which creates a synthetic body (lines 1804-1806), so body can never be null here. statements.swift:269 tests exactly this case.
Also cleaned up unnecessary body.isNonNull() check here. The code just above already constructs a synthetic empty brace stmt for the body if it didn’t have a real one.
|
(Rebased and merged to fix conflict -- just a new expected warning got added near the test added in this pull.) |
|
Doug, I agree with @gregomni Patch looks good to me, thanks! |
lattner
added a commit
that referenced
this pull request
Jan 16, 2016
[SR-165][Parser] Fix diagnosis location for missing while after repeat body
MaxDesiatov
pushed a commit
to MaxDesiatov/swift
that referenced
this pull request
May 1, 2020
[pull] swiftwasm from master
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.
Also cleaned up unnecessary body.isNonNull() check here. The code just above already constructs a synthetic empty brace stmt for the body if it didn’t have a real one.