From 4fdf3fda0f970805b2404e71f466f430ab8cd9fd Mon Sep 17 00:00:00 2001
From: Dong-hee Na <donghee.na@python.org>
Date: Mon, 21 Aug 2023 14:50:09 +0900
Subject: [PATCH] gh-107265: Fix code_richcompare for ENTER_EXECUTOR case
 (gh-108165)

---
 Lib/test/test_capi/test_misc.py | 11 +++++++++++
 Objects/codeobject.c            | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/Lib/test/test_capi/test_misc.py b/Lib/test/test_capi/test_misc.py
index 18a0476122d..ea0504333ba 100644
--- a/Lib/test/test_capi/test_misc.py
+++ b/Lib/test/test_capi/test_misc.py
@@ -2341,6 +2341,17 @@ class TestOptimizerAPI(unittest.TestCase):
             long_loop()
             self.assertEqual(opt.get_count(), 10)
 
+    def test_code_richcompare(self):
+        def testfunc(x):
+            i = 0
+            while i < x:
+                i += 1
+
+        opt = _testinternalcapi.get_counter_optimizer()
+        with temporary_optimizer(opt):
+            testfunc(1000)
+            self.assertEqual(testfunc.__code__, testfunc.__code__.replace())
+
 
 def get_first_executor(func):
     code = func.__code__
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 4d6efe938f4..c34905c3196 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -1781,8 +1781,25 @@ code_richcompare(PyObject *self, PyObject *other, int op)
     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];
+
+        if (co_instr.op.code == ENTER_EXECUTOR) {
+            const int exec_index = co_instr.op.arg;
+            _PyExecutorObject *exec = co->co_executors->executors[exec_index];
+            co_instr.op.code = exec->vm_data.opcode;
+            co_instr.op.arg = exec->vm_data.oparg;
+        }
+        assert(co_instr.op.code != ENTER_EXECUTOR);
         co_instr.op.code = _PyOpcode_Deopt[co_instr.op.code];
+
+        if (cp_instr.op.code == ENTER_EXECUTOR) {
+            const int exec_index = cp_instr.op.arg;
+            _PyExecutorObject *exec = cp->co_executors->executors[exec_index];
+            cp_instr.op.code = exec->vm_data.opcode;
+            cp_instr.op.arg = exec->vm_data.oparg;
+        }
+        assert(cp_instr.op.code != ENTER_EXECUTOR);
         cp_instr.op.code = _PyOpcode_Deopt[cp_instr.op.code];
+
         eq = co_instr.cache == cp_instr.cache;
         if (!eq) {
             goto unequal;