fix

python · Sep 25, 2024 · c5825fb · c5825fb
1 parent 2479da8
commit c5825fb
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 24 deletions.
diff --git a/Include/internal/pycore_cell.h b/Include/internal/pycore_cell.h
@@ -48,15 +48,12 @@ _PyCell_GetStackRef(PyCellObject *cell, _PyStackRef *value_addr)
 {
     PyObject *value;
 #ifdef Py_GIL_DISABLED
-    for(;;) {
-        value = _Py_atomic_load_ptr(&cell->ob_ref);
-        if (value != NULL) {
-            if (_Py_TryIncrefCompare(&cell->ob_ref, value)) {
-                *value_addr = _PyStackRef_FromPyObjectSteal(value);
-                return;
-            }
+    value = _Py_atomic_load_ptr(&cell->ob_ref);
+    if (value != NULL) {
+        if (_Py_TryIncrefCompare(&cell->ob_ref, value)) {
+            *value_addr = _PyStackRef_FromPyObjectSteal(value);
+            return;
         }
-        break;
     }
 #endif
     value = PyCell_GetRef(cell);

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -1647,10 +1647,10 @@ dummy_func(
             value = PyStackRef_FromPyObjectSteal(value_o);
         }
 
-        inst(LOAD_DEREF, ( -- value[1])) {
+        inst(LOAD_DEREF, ( -- value)) {
             PyCellObject *cell = (PyCellObject *)PyStackRef_AsPyObjectBorrow(GETLOCAL(oparg));
-            _PyCell_GetStackRef(cell, value);
-            if (PyStackRef_IsNull(*value)) {
+            _PyCell_GetStackRef(cell, &value);
+            if (PyStackRef_IsNull(value)) {
                 _PyEval_FormatExcUnbound(tstate, _PyFrame_GetCode(frame), oparg);
                 ERROR_IF(true, error);
             }

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h