Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-107265: Fix code_hash for ENTER_EXECUTOR case (#108188)

This commit is contained in:
Dong-hee Na 2023-08-22 06:22:18 +09:00 committed by GitHub
parent 4b32d4f49c
commit e6db23f66d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/test/test_capi/test_misc.py
View File

@ -2341,7 +2341,7 @@ class TestOptimizerAPI(unittest.TestCase):
long_loop() long_loop()
self.assertEqual(opt.get_count(), 10) self.assertEqual(opt.get_count(), 10)
def test_code_richcompare(self): def test_code_restore_for_ENTER_EXECUTOR(self):
def testfunc(x): def testfunc(x):
i = 0 i = 0
while i < x: while i < x:
@ -2350,7 +2350,9 @@ class TestOptimizerAPI(unittest.TestCase):
opt = _testinternalcapi.get_counter_optimizer() opt = _testinternalcapi.get_counter_optimizer()
with temporary_optimizer(opt): with temporary_optimizer(opt):
testfunc(1000) testfunc(1000)
self.assertEqual(testfunc.__code__, testfunc.__code__.replace()) code, replace_code = testfunc.__code__, testfunc.__code__.replace()
self.assertEqual(code, replace_code)
self.assertEqual(hash(code), hash(replace_code))
def get_first_executor(func): def get_first_executor(func):

53
Objects/codeobject.c
View File

@ -1781,30 +1781,33 @@ code_richcompare(PyObject *self, PyObject *other, int op)
for (int i = 0; i < Py_SIZE(co); i++) { for (int i = 0; i < Py_SIZE(co); i++) {
_Py_CODEUNIT co_instr = _PyCode_CODE(co)[i]; _Py_CODEUNIT co_instr = _PyCode_CODE(co)[i];
_Py_CODEUNIT cp_instr = _PyCode_CODE(cp)[i]; _Py_CODEUNIT cp_instr = _PyCode_CODE(cp)[i];
uint8_t co_code = co_instr.op.code;
uint8_t co_arg = co_instr.op.arg;
uint8_t cp_code = cp_instr.op.code;
uint8_t cp_arg = cp_instr.op.arg;
if (co_instr.op.code == ENTER_EXECUTOR) { if (co_code == ENTER_EXECUTOR) {
const int exec_index = co_instr.op.arg; const int exec_index = co_arg;
_PyExecutorObject *exec = co->co_executors->executors[exec_index]; _PyExecutorObject *exec = co->co_executors->executors[exec_index];
co_instr.op.code = exec->vm_data.opcode; co_code = exec->vm_data.opcode;
co_instr.op.arg = exec->vm_data.oparg; co_arg = exec->vm_data.oparg;
} }
assert(co_instr.op.code != ENTER_EXECUTOR); assert(co_code != ENTER_EXECUTOR);
co_instr.op.code = _PyOpcode_Deopt[co_instr.op.code]; co_code = _PyOpcode_Deopt[co_code];
if (cp_instr.op.code == ENTER_EXECUTOR) { if (cp_code == ENTER_EXECUTOR) {
const int exec_index = cp_instr.op.arg; const int exec_index = cp_arg;
_PyExecutorObject *exec = cp->co_executors->executors[exec_index]; _PyExecutorObject *exec = cp->co_executors->executors[exec_index];
cp_instr.op.code = exec->vm_data.opcode; cp_code = exec->vm_data.opcode;
cp_instr.op.arg = exec->vm_data.oparg; cp_arg = exec->vm_data.oparg;
} }
assert(cp_instr.op.code != ENTER_EXECUTOR); assert(cp_code != ENTER_EXECUTOR);
cp_instr.op.code = _PyOpcode_Deopt[cp_instr.op.code]; cp_code = _PyOpcode_Deopt[cp_code];
eq = co_instr.cache == cp_instr.cache; if (co_code != cp_code || co_arg != cp_arg) {
if (!eq) {
goto unequal; goto unequal;
} }
i += _PyOpcode_Caches[co_instr.op.code]; i += _PyOpcode_Caches[co_code];
} }
/* compare constants */ /* compare constants */
@ -1883,10 +1886,22 @@ code_hash(PyCodeObject *co)
SCRAMBLE_IN(co->co_firstlineno); SCRAMBLE_IN(co->co_firstlineno);
SCRAMBLE_IN(Py_SIZE(co)); SCRAMBLE_IN(Py_SIZE(co));
for (int i = 0; i < Py_SIZE(co); i++) { for (int i = 0; i < Py_SIZE(co); i++) {
int deop = _Py_GetBaseOpcode(co, i); _Py_CODEUNIT co_instr = _PyCode_CODE(co)[i];
SCRAMBLE_IN(deop); uint8_t co_code = co_instr.op.code;
SCRAMBLE_IN(_PyCode_CODE(co)[i].op.arg); uint8_t co_arg = co_instr.op.arg;
i += _PyOpcode_Caches[deop]; if (co_code == ENTER_EXECUTOR) {
_PyExecutorObject *exec = co->co_executors->executors[co_arg];
assert(exec != NULL);
assert(exec->vm_data.opcode != ENTER_EXECUTOR);
co_code = _PyOpcode_Deopt[exec->vm_data.opcode];
co_arg = exec->vm_data.oparg;
}
else {
co_code = _Py_GetBaseOpcode(co, i);
}
SCRAMBLE_IN(co_code);
SCRAMBLE_IN(co_arg);
i += _PyOpcode_Caches[co_code];
} }
if ((Py_hash_t)uhash == -1) { if ((Py_hash_t)uhash == -1) {
return -2; return -2;