gh-115999: Use light-weight lock for UNPACK_SEQUENCE_LIST (gh-127514)

python · Dec 2, 2024 · 7c2bd9b · 7c2bd9b
1 parent 3e81225
commit 7c2bd9b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 44 deletions.
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -1438,24 +1438,17 @@ dummy_func(
         inst(UNPACK_SEQUENCE_LIST, (unused/1, seq -- values[oparg])) {
             PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq);
             DEOPT_IF(!PyList_CheckExact(seq_o));
-            #ifdef Py_GIL_DISABLED
-            PyCriticalSection cs;
-            PyCriticalSection_Begin(&cs, seq_o);
-            #endif
+            DEOPT_IF(!LOCK_OBJECT(seq_o));
             if (PyList_GET_SIZE(seq_o) != oparg) {
-                #ifdef Py_GIL_DISABLED
-                PyCriticalSection_End(&cs);
-                #endif
+                UNLOCK_OBJECT(seq_o);
                 DEOPT_IF(true);
             }
             STAT_INC(UNPACK_SEQUENCE, hit);
             PyObject **items = _PyList_ITEMS(seq_o);
             for (int i = oparg; --i >= 0; ) {
                 *values++ = PyStackRef_FromPyObjectNew(items[i]);
             }
-            #ifdef Py_GIL_DISABLED
-            PyCriticalSection_End(&cs);
-            #endif
+            UNLOCK_OBJECT(seq_o);
             DECREF_INPUTS();
         }
 

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