Skip to content

GH-100982: Break up COMPARE_AND_BRANCH #102801

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
brandtbucher merged 15 commits into from
Mar 23, 2023
Merged

GH-100982: Break up COMPARE_AND_BRANCH #102801

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
53e50c4
Get rid of COMPARE_AND_BRANCH
brandtbucher Feb 1, 2023
20b59ac
Embed the mask in the oparg again
brandtbucher Feb 2, 2023
781c986
Catch up with main
brandtbucher Feb 2, 2023
49083fa
fixup
brandtbucher Feb 2, 2023
39ace64
Catch up with main
brandtbucher Feb 22, 2023
0754813
Catch up with main
brandtbucher Mar 10, 2023
e93b6fe
Bump magic number
brandtbucher Mar 10, 2023
fd42c63
Fixup bytecodes.c
brandtbucher Mar 10, 2023
d42ac00
Catch up with main
brandtbucher Mar 16, 2023
eaf0fc6
blurb add
brandtbucher Mar 17, 2023
e911d60
fixup
brandtbucher Mar 17, 2023
29d3966
Catch up with main
brandtbucher Mar 20, 2023
94b3836
Sorry, Eric!
brandtbucher Mar 20, 2023
31a13a4
Catch up with main
brandtbucher Mar 23, 2023
ac5a8e5
Catch up with main (again)
brandtbucher Mar 23, 2023
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
fixup
  • Loading branch information
@brandtbucher
brandtbucher committed Feb 2, 2023
commit 49083fa4e671cb44aedfca18129a31b97a2b3112
2 changes: 1 addition & 1 deletion Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ dummy_func(
PyObject **stack_pointer,
PyObject *kwnames,
int throwflag,
binaryfunc binary_ops[],
binaryfunc binary_ops[]
)
{
_PyInterpreterFrame entry_frame;
Expand Down
2 changes: 2 additions & 0 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2892,6 +2892,8 @@ static int compiler_addcompare(struct compiler *c, location loc,
default:
Py_UNREACHABLE();
}
/* cmp goes in top bits of the oparg, while the low bits are used by quickened
* versions of this opcode to store the comparison mask. */
ADDOP_I(c, loc, COMPARE_OP, (cmp << 4) | compare_masks[cmp]);
return SUCCESS;
}
Expand Down