Skip to content

gh-150027: Avoid copying during construction of frozenset objects #150028

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.

Sign up for GitHub

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

Merged
ZeroIntensity merged 10 commits into from
May 19, 2026
Merged

gh-150027: Avoid copying during construction of frozenset objects #150028

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4a05023
Initial implementation.
ZeroIntensity May 18, 2026
3fe7fac
Add tests and fix things.
ZeroIntensity May 18, 2026
ab4bd0a
Add blurb.
ZeroIntensity May 18, 2026
3e21fd6
Changes based on sprint feedback.
ZeroIntensity May 18, 2026
a0ecb7c
Only optimize for set literals (and comprehensions).
ZeroIntensity May 18, 2026
a44772b
Modify the type instead of making a new object.
ZeroIntensity May 18, 2026
e7f2d56
Rename to _PySet_Freeze
ZeroIntensity May 18, 2026
ed49167
Refactor if statement.
ZeroIntensity May 18, 2026
e7fc901
Add a bytecode test.
ZeroIntensity May 19, 2026
eeea087
Add a label to the test.
ZeroIntensity May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Only optimize for set literals (and comprehensions).
  • Loading branch information
@ZeroIntensity
ZeroIntensity committed May 18, 2026
commit a0ecb7ccab16715823882fad205ff76a3e948e51
14 changes: 8 additions & 6 deletions Python/codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3960,8 +3960,11 @@ maybe_optimize_function_call(compiler *c, expr_ty e, jump_target_label end)

location loc = LOC(func);

if (asdl_seq_GET(args, 0)->kind != GeneratorExp_kind) {
if (_PyUnicode_EqualToASCIIString(func->v.Name.id, "frozenset")) {
expr_ty arg_expr = asdl_seq_GET(args, 0);

if (arg_expr->kind != GeneratorExp_kind) {

@markshannon markshannon May 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you move this test after the body of this optimization:

if (_PyUnicode_EqualToASCIIString(func->v.Name.id, "frozenset") ...
    ...
}
if (arg_expr->kind != GeneratorExp_kind) {
    return 0;
}

if (_PyUnicode_EqualToASCIIString(func->v.Name.id, "frozenset")
&& (arg_expr->kind == Set_kind || arg_expr->kind == SetComp_kind)) {
NEW_JUMP_TARGET_LABEL(c, skip_optimization);

ADDOP_I(c, loc, COPY, 1);
Expand All @@ -3970,7 +3973,7 @@ maybe_optimize_function_call(compiler *c, expr_ty e, jump_target_label end)
ADDOP_JUMP(c, loc, POP_JUMP_IF_FALSE, skip_optimization);
ADDOP(c, loc, POP_TOP);

VISIT(c, expr, e->v.Call.args->elements[0]);
VISIT(c, expr, arg_expr);
ADDOP_I(c, loc, CALL_INTRINSIC_1, INTRINSIC_BUILD_FROZENSET);

ADDOP_JUMP(c, loc, JUMP, end);
Expand All @@ -3982,8 +3985,7 @@ maybe_optimize_function_call(compiler *c, expr_ty e, jump_target_label end)
return 0;
}

expr_ty generator_exp = asdl_seq_GET(args, 0);
PySTEntryObject *generator_entry = _PySymtable_Lookup(SYMTABLE(c), (void *)generator_exp);
PySTEntryObject *generator_entry = _PySymtable_Lookup(SYMTABLE(c), (void *)arg_expr);
if (generator_entry->ste_coroutine) {
Py_DECREF(generator_entry);
return 0;
Expand Down Expand Up @@ -4030,7 +4032,7 @@ maybe_optimize_function_call(compiler *c, expr_ty e, jump_target_label end)
} else if (const_oparg == CONSTANT_BUILTIN_SET || const_oparg == CONSTANT_BUILTIN_FROZENSET) {
ADDOP_I(c, loc, BUILD_SET, 0);
}
VISIT(c, expr, generator_exp);
VISIT(c, expr, arg_expr);

NEW_JUMP_TARGET_LABEL(c, loop);
NEW_JUMP_TARGET_LABEL(c, cleanup);
Expand Down
Loading