chore: resolve review comment

Author: fatelei

Lib/test/test_ordered_dict.py

@@ -994,7 +994,7 @@ class MyOD(self.OrderedDict):
             def __getitem__(self, key):
                 self.call_count += 1
                 if self.call_count == 1:
-                    del self[next(iter(self))]
+                    del self[3]
                 return super().__getitem__(key)
 
         od = MyOD([(1, 'one'), (2, 'two'), (3, 'three')])
@@ -1006,7 +1006,7 @@ class MyOD(self.OrderedDict):
             def __getitem__(self, key):
                 self.call_count += 1
                 if self.call_count == 1:
-                    self.pop(next(iter(self)))
+                    self.pop(3)
                 return super().__getitem__(key)
 
         od = MyOD([(1, 'one'), (2, 'two'), (3, 'three')])
@@ -1015,33 +1015,41 @@ def __getitem__(self, key):
     def test_copy_concurrent_deletion_and_set_in__getitem__(self):
         class MyOD(self.OrderedDict):
             call_count = 0
+            instance_count = 0
+
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+                MyOD.instance_count += 1
+
             def __getitem__(self, key):
                 self.call_count += 1
                 if self.call_count == 1:
-                    del self[next(iter(self))]
+                    del self[4]
                 elif self.call_count == 2:
                     self['new_key'] = 'new_value'
                 return super().__getitem__(key)
 
         od = MyOD([(1, 'one'), (2, 'two'), (3, 'three'), (4, 'four')])
         self.assertRaises(RuntimeError, od.copy)
+        self.assertEqual(MyOD.instance_count, 2)
 
     def test_copy_concurrent_mutation_in__setitem__(self):
         od = None
         class MyOD(self.OrderedDict):
-            _instance_count = 0
+            instance_count = 0
 
             def __init__(self, *args, **kwargs):
                 super().__init__(*args, **kwargs)
-                MyOD._instance_count += 1
+                MyOD.instance_count += 1
 
             def __setitem__(self, key, value):
-                if self._instance_count == 2 and len(od) > 1:
+                if self.instance_count == 2 and len(od) > 1:
                     del od[next(iter(od))]
                 return super().__setitem__(key, value)
 
         od = MyOD([(1, 'one'), (2, 'two'), (3, 'three')])
         self.assertRaises(RuntimeError, od.copy)
+        self.assertEqual(MyOD.instance_count, 2)
 
 
 class PurePythonOrderedDictSubclassTests(PurePythonOrderedDictTests):

Objects/odictobject.c

@@ -1274,12 +1274,15 @@ OrderedDict_copy_impl(PyObject *od)
             PyObject *value = PyObject_GetItem(od, key);
             if (value == NULL) {
                 Py_DECREF(key);
-                if (self->od_state != state) {
-                    goto invalid_state;
-                }
                 goto fail;
             }
 
+            if (self->od_state != state) {
+                Py_DECREF(key);
+                Py_DECREF(value);
+                goto invalid_state;  // 成功获取值但状态改变
+            }
+
             int rc = PyObject_SetItem(od_copy, key, value);
             Py_DECREF(key);
             Py_DECREF(value);