make EndSwitch flush cases to the EndSwitch offset #6072
Merged
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
meg-gupta
reviewed
Apr 9, 2019
| @@ -163,7 +163,7 @@ SwitchIRBuilder::BeginSwitch() | |||
| void | |||
| SwitchIRBuilder::EndSwitch(uint32 offset, uint32 targetOffset) | |||
| { | |||
| FlushCases(targetOffset); | |||
| FlushCases(offset); | |||
| AssertMsg(m_caseNodes->Count() == 0, "Not all switch case nodes built by end of switch"); | |||
There was a problem hiding this comment.
What is offset/targetOffset here ? (I don't know this code)
There was a problem hiding this comment.
offset is the location of the EndSwitch instruction. targetOffset is the location that EndSwitch branches to.
meg-gupta
approved these changes
Apr 9, 2019
chakrabot
pushed a commit
that referenced
this pull request
Apr 9, 2019
… offset Merge pull request #6072 from MikeHolman:endswitchbug This makes it so that if targetOffset is breaking out of a loop we won't have problems (could happen in wasm). Now cases will go to EndSwitch, which just does direct branch to targetOffset. In normal cases, that will be cleaned up by RetargetBrToBr peep, so codegen doesn't change. Fixes #6037
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.
This makes it so that if targetOffset is breaking out of a loop we won't have problems (could happen in wasm).
Now cases will go to EndSwitch, which just does direct branch to targetOffset. In normal cases, that will be cleaned up by RetargetBrToBr peep, so codegen doesn't change.
Fixes #6037