Compiler: avoid creating Set in merge_if_vars #12433
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
|
It's easier to review this with "Hide whitespace" |
Comment on lines
1897
to
1900
| then_var = then_vars[name]? | ||
| else_var = else_vars[name]? | ||
| next if then_var | ||
|
|
||
| # Check whether the var didn't change at all | ||
| next if then_var.same?(else_var) | ||
| merge_if_var(name, node, cond_vars, then_var, else_var, before_then_vars, before_else_vars, then_unreachable, else_unreachable) |
There was a problem hiding this comment.
then_var must be nil after next. So I'm wondering if this tiny refactor might be a bit better? It just avoids fetching the actual then_var, because the value is not used.
Suggested change
| then_var = then_vars[name]? | |
| else_var = else_vars[name]? | |
| next if then_var | |
| # Check whether the var didn't change at all | |
| next if then_var.same?(else_var) | |
| merge_if_var(name, node, cond_vars, then_var, else_var, before_then_vars, before_else_vars, then_unreachable, else_unreachable) | |
| next if then_vars.has_key?(name) | |
| merge_if_var(name, node, cond_vars, nil, else_var, before_then_vars, before_else_vars, then_unreachable, else_unreachable) |
There was a problem hiding this comment.
The diff looks very weird. I don't know why... Just ignore the first 5 deleted lines in the suggestion.
straight-shoota
approved these changes
Aug 31, 2022
asterite
added a commit
that referenced
this pull request
Sep 5, 2022
* Don't create `MetaVar` unless needed * Make check earlier to avoid extra Hash lookups * Even less extra Hash lookups * Compiler: avoid creating Set in merge_if_vars (#12433)
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.
Yes another optimization in
merge_if_vars. This one has a bit more impact: less memory allocated, and slightly better performance.When merging
ifvars we need to traverse all vars defined in thethenandelsebranches. We were doing this by creating a Set will all var names from both branches and then traversing that.However, it's more efficient if we first traverse the vars in
then. Then when traversing the vars inelsewe can skip that if we already traversed it in thethenbranch.