-
-
Notifications
You must be signed in to change notification settings - Fork 3k
[mypyc] feat: try constant fold in convert_format_expr_to_str
#20092
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
BobTheBuidler
wants to merge
3
commits into
python:master
Choose a base branch
from
BobTheBuidler:patch-22
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,7 @@ | |
| is_str_rprimitive, | ||
| ) | ||
| from mypyc.irbuild.builder import IRBuilder | ||
| from mypyc.irbuild.constant_fold import constant_fold_expr | ||
| from mypyc.primitives.bytes_ops import bytes_build_op | ||
| from mypyc.primitives.int_ops import int_to_str_op | ||
| from mypyc.primitives.str_ops import str_build_op, str_op | ||
|
|
@@ -143,16 +144,19 @@ def convert_format_expr_to_str( | |
| for x, format_op in zip(exprs, format_ops): | ||
| node_type = builder.node_type(x) | ||
| if format_op == FormatOp.STR: | ||
| if is_str_rprimitive(node_type) or isinstance( | ||
| x, StrExpr | ||
| ): # NOTE: why does mypyc think our fake StrExprs are not str rprimitives? | ||
| if is_str_rprimitive(node_type) or isinstance(x, StrExpr): | ||
| # NOTE: why does mypyc think our fake StrExprs are not str rprimitives? | ||
| var_str = builder.accept(x) | ||
| elif (folded := constant_fold_expr(builder, x)) is not None: | ||
| var_str = builder.accept(StrExpr(str(folded))) | ||
| elif is_int_rprimitive(node_type) or is_short_int_rprimitive(node_type): | ||
| var_str = builder.primitive_op(int_to_str_op, [builder.accept(x)], line) | ||
| else: | ||
| var_str = builder.primitive_op(str_op, [builder.accept(x)], line) | ||
| elif format_op == FormatOp.INT: | ||
| if is_int_rprimitive(node_type) or is_short_int_rprimitive(node_type): | ||
| if isinstance(folded := constant_fold_expr(builder, x), int): | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. if the expr can fold as an int we can convert it to str at build time |
||
| var_str = builder.accept(StrExpr(str(folded))) | ||
| elif is_int_rprimitive(node_type) or is_short_int_rprimitive(node_type): | ||
| var_str = builder.primitive_op(int_to_str_op, [builder.accept(x)], line) | ||
| else: | ||
| return None | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
foldable non-string values can be easily converted to str