Skip to content

Commit 9de1c2c

Browse files
committed
fix merge conflict
1 parent e9c1e24 commit 9de1c2c

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Python/optimizer_bytecodes.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,15 +618,17 @@ dummy_func(void) {
618618
}
619619

620620
op(_TO_BOOL_DICT, (value -- res)) {
621-
int already_bool = optimize_to_bool(this_instr, ctx, value, &res, false);
621+
int already_bool = optimize_to_bool(this_instr, ctx, value, &res,
622+
_POP_TOP, _NOP);
622623
if (!already_bool) {
623624
sym_set_type(value, &PyDict_Type);
624625
res = sym_new_truthiness(ctx, value, true);
625626
}
626627
}
627628

628629
op(_TO_BOOL_SIZED, (value -- res)) {
629-
int already_bool = optimize_to_bool(this_instr, ctx, value, &res, false);
630+
int already_bool = optimize_to_bool(this_instr, ctx, value, &res,
631+
_POP_TOP, _NOP);
630632
if (!already_bool) {
631633
res = sym_new_truthiness(ctx, value, true);
632634
}

Python/optimizer_cases.c.h

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)