Rename stack variables in CFGWalker (NFC) #6232
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
This renames `***Stack` variables in `CFGWalker` to be consistent, as a preparation for adding another stack for the new EH. Currently `ifStack` and `loopStack` contains `BasicBlock*`s but `tryStack` contains `Expression*`, and `Try` expressions are rather contained in `unwindExprStack`, which to me is confusing. This also swaps the order of some code which is NFC (to make the later diff cleaner).
kripken reviewed Jan 22, 2024
src/cfg/cfg-traversal.h Outdated
| auto* tryy = self->unwindExprStack[i]->template cast<Try>(); | ||
| // Exception thrown. Note outselves so that we will create a link to each | ||
| // catch within the try when we get there. | ||
| self->throwingInstsStack[i].push_back(self->currBasicBlock); |
There was a problem hiding this comment.
This code movement is not obviously NFC to me. Before it was not reached if we got to the break or continue on new lines 293 and 307?
There was a problem hiding this comment.
Hmm, you're right. Will revert this.
kripken approved these changes Jan 23, 2024
radekdoulik pushed a commit to dotnet/binaryen that referenced this pull request Jul 12, 2024
This renames `***Stack` variables in `CFGWalker` to be consistent, as a preparation for adding another stack for the new EH. Currently `ifStack` and `loopStack` contains `BasicBlock*`s but `tryStack` contains `Expression*`, and `Try` expressions are rather contained in `unwindExprStack`, which to me is confusing.
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants
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 renames
***Stackvariables inCFGWalkerto be consistent, as a preparation for adding another stack for the new EH. CurrentlyifStackandloopStackcontainsBasicBlock*s buttryStackcontainsExpression*, andTryexpressions are rather contained inunwindExprStack, which to me is confusing.