[Python-checkins] bpo-46841: Avoid unnecessary allocations in code object comparisons (GH-32222)

Fri Apr 1 06:42:55 EDT 2022

https://github.com/python/cpython/commit/bd2e47c8830d1b2869f2b4345945a5e0c3b4e3fb
commit: bd2e47c8830d1b2869f2b4345945a5e0c3b4e3fb
branch: main
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: markshannon <mark at hotpy.org>
date: 2022年04月01日T11:42:46+01:00
summary:
bpo-46841: Avoid unnecessary allocations in code object comparisons (GH-32222)
files:
A Misc/NEWS.d/next/Core and Builtins/2022-03-31-15-57-42.bpo-46841.U-25Z6.rst
M Objects/codeobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-03-31-15-57-42.bpo-46841.U-25Z6.rst b/Misc/NEWS.d/next/Core and Builtins/2022-03-31-15-57-42.bpo-46841.U-25Z6.rst
new file mode 100644
index 0000000000000..42711cd40f396
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-03-31-15-57-42.bpo-46841.U-25Z6.rst	
@@ -0,0 +1 @@
+Avoid unnecessary allocations when comparing code objects.
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 224493edb19ea..987cdef3c90d4 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -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);
