[mypyc] Refactor IR building for generator functions #19008
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
JukkaL
commented
May 1, 2025
| @@ -191,6 +191,41 @@ def add_args_to_env( | |||
| builder.add_var_to_env_class(arg.variable, rtype, base, reassign=reassign) | |||
|
|
|||
|
|
|||
| def add_vars_to_env(builder: IRBuilder) -> None: | |||
There was a problem hiding this comment.
Move this code here since this is used for both regular and generator functions.
JukkaL
commented
May 1, 2025
|
|
||
| # Add all variables and functions that are declared/defined within this |
There was a problem hiding this comment.
The following code was moved to add_vars_to_env.
svalentin
approved these changes
May 1, 2025
mypyc/irbuild/function.py
Outdated
Comment on lines
264
to
269
| # Re-enter the FuncItem and visit the body of the function this time. | ||
| builder.enter(fn_info) | ||
| setup_env_for_generator_class(builder) | ||
| symtable = gen_generator_func_body(builder, fn_info, sig) | ||
|
|
||
| load_outer_envs(builder, builder.fn_info.generator_class) | ||
| top_level = builder.top_level_fn_info() | ||
| if ( | ||
| builder.fn_info.is_nested | ||
| and isinstance(fitem, FuncDef) | ||
| and top_level | ||
| and top_level.add_nested_funcs_to_env | ||
| ): | ||
| setup_func_for_recursive_call(builder, fitem, builder.fn_info.generator_class) | ||
| create_switch_for_generator_class(builder) | ||
| add_raise_exception_blocks_to_generator_class(builder, fitem.line) | ||
| # Evaluate argument defaults in the surrounding scope, since we | ||
| # calculate them *once* when the function definition is evaluated. | ||
| calculate_arg_defaults(builder, fn_info, func_reg, symtable) |
There was a problem hiding this comment.
Should we move this to gen_generator_func to make it consistent with gen_func_body?
We could technically take it out of the is_generator switch. It's just the symtable that differs if I am reading the code correctly.
There was a problem hiding this comment.
The only reason I didn't do it is that we'd need find a new module for calculate_arg_defaults to avoid a cyclic dependency. I'll think about it.
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.
The code was pretty hard to follow, since there were many conditional code paths in a very long function that handles both normal functions, nested functions and generators.
Move much of the generator-specific code to a helper function. This required moving some functionality to helper functions to avoid code duplication. Also pass a function as an argument to avoid a dependency cycle.
This is quite a big refactoring, and it's easier to follow by looking at the individual commits in this PR.