Skip to content

bpo-46841: Avoid unnecessary allocations in code object comparisons #32222

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
markshannon merged 2 commits into from
Apr 1, 2022
Merged

bpo-46841: Avoid unnecessary allocations in code object comparisons #32222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4945b03
Compare instructions one-by-one
brandtbucher Mar 31, 2022
bed7aa0
blurb add
brandtbucher Mar 31, 2022
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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-03-31-15-57-42.bpo-46841.U-25Z6.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Avoid unnecessary allocations when comparing code objects.
26 changes: 13 additions & 13 deletions Objects/codeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1398,21 +1398,21 @@ code_richcompare(PyObject *self, PyObject *other, int op)
if (!eq) goto unequal;
eq = co->co_firstlineno == cp->co_firstlineno;
if (!eq) goto unequal;
PyObject *co_code = _PyCode_GetCode(co);
if (co_code == NULL) {
return NULL;
}
PyObject *cp_code = _PyCode_GetCode(cp);
if (cp_code == NULL) {
Py_DECREF(co_code);
return NULL;
}
eq = PyObject_RichCompareBool(co_code, cp_code, Py_EQ);
Py_DECREF(co_code);
Py_DECREF(cp_code);
if (eq <= 0) {
eq = Py_SIZE(co) == Py_SIZE(cp);
if (!eq) {
goto unequal;
}
for (int i = 0; i < Py_SIZE(co); i++) {
_Py_CODEUNIT co_instr = _PyCode_CODE(co)[i];
_Py_CODEUNIT cp_instr = _PyCode_CODE(cp)[i];
_Py_SET_OPCODE(co_instr, _PyOpcode_Deopt[_Py_OPCODE(co_instr)]);
_Py_SET_OPCODE(cp_instr, _PyOpcode_Deopt[_Py_OPCODE(cp_instr)]);
eq = co_instr == cp_instr;
if (!eq) {
goto unequal;
}
i += _PyOpcode_Caches[_Py_OPCODE(co_instr)];
}

/* compare constants */
consts1 = _PyCode_ConstantKey(co->co_consts);
Expand Down