SMV: avoid some expression copies #999
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
kroening
force-pushed
the
smv-parse-tree-move
branch
from
7a44cc3 to
97b2b2b
Compare
tautschnig
approved these changes
Feb 19, 2025
src/smvlang/parser.y
Outdated
Comment on lines
491
to
494
| exprt &op=stack_expr($3); | ||
| unary_exprt tmp(ID_smv_next, std::move(op)); | ||
| tmp.swap(op); | ||
| PARSER.module->add_assign_next(to_equal_expr(stack_expr($$))); | ||
| PARSER.module->add_assign_next(std::move(stack_expr($3)), std::move(stack_expr($6))); |
There was a problem hiding this comment.
How about:
unary_exprt tmp{ID_smv_next, stack_expr($3)};
PARSER.module->add_assign_next(std::move(tmp), std::move(stack_expr($6)));
even if just a human not having to track what really lives at $3 at which point in this sequence.
src/smvlang/smv_parse_tree.h
Outdated
Comment on lines
124
to
127
| items.push_back(itemt{}); | ||
| items.back().item_type=item_type; | ||
| items.back().expr=expr; | ||
| items.back().location=location; | ||
| items.back().expr = std::move(expr); | ||
| items.back().location = std::move(location); |
There was a problem hiding this comment.
Perhaps itemt should have a proper constructor, at which point it should be possible to use
items.emplace_back(item_type, std::move(expr), std::move(location));. (Which in turns makes me wonder whether we could then just get rid of add_item as a wrapper altogether.)
References are changed to rvalue references to avoid some copying when populating the parse tree.
kroening
force-pushed
the
smv-parse-tree-move
branch
from
97b2b2b to
a06ddb2
Compare
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.
References are changed to rvalue references to avoid some copying when populating the parse tree.