Remove usage of locked_deref_assign()

Author: ZeroIntensity

Modules/_ctypes/_ctypes.c

@@ -3472,9 +3472,9 @@ _PyCData_set(ctypes_state *st,
         }
         Py_BEGIN_CRITICAL_SECTION(src);
         *(void **)ptr = src->b_ptr;
-        Py_END_CRITICAL_SECTION();
 
         keep = GetKeepedObjects(src);
+        Py_END_CRITICAL_SECTION();
         if (keep == NULL)
             return NULL;
 
@@ -5563,7 +5563,7 @@ Pointer_get_contents(PyObject *self, void *closure)
 }
 
 static int
-Pointer_set_contents(PyObject *op, PyObject *value, void *closure)
+Pointer_set_contents_lock_held(PyObject *op, PyObject *value, void *closure)
 {
     CDataObject *dst;
     PyObject *keep;
@@ -5595,15 +5595,7 @@ Pointer_set_contents(PyObject *op, PyObject *value, void *closure)
     }
 
     dst = (CDataObject *)value;
-    if (dst != self) {
-        Py_BEGIN_CRITICAL_SECTION(dst);
-        locked_deref_assign(self, dst->b_ptr);
-        Py_END_CRITICAL_SECTION();
-    } else {
-        Py_BEGIN_CRITICAL_SECTION(self);
-        *((void **)self->b_ptr) = dst->b_ptr;
-        Py_END_CRITICAL_SECTION();
-    }
+    *((void **)self->b_ptr) = dst->b_ptr;
 
     /*
        A Pointer instance must keep the value it points to alive.  So, a
@@ -5622,6 +5614,16 @@ Pointer_set_contents(PyObject *op, PyObject *value, void *closure)
     return KeepRef(self, 0, keep);
 }
 
+static int
+Pointer_set_contents(PyObject *op, PyObject *value, void *closure)
+{
+    int res;
+    Py_BEGIN_CRITICAL_SECTION2(op, value);
+    res = Pointer_set_contents_lock_held(op, value, closure);
+    Py_END_CRITICAL_SECTION2();
+    return res;
+}
+
 static PyGetSetDef Pointer_getsets[] = {
     { "contents", Pointer_get_contents, Pointer_set_contents,
       "the object this pointer points to (read-write)", NULL },

Modules/_ctypes/ctypes.h

@@ -654,12 +654,3 @@ locked_deref(CDataObject *self)
     Py_END_CRITICAL_SECTION();
     return ptr;
 }
-
-/* Equivalent to *self->b_ptr = new_ptr with a lock. */
-static inline void
-locked_deref_assign(CDataObject *self, void *new_ptr)
-{
-    Py_BEGIN_CRITICAL_SECTION(self);
-    *(void **)self->b_ptr = new_ptr;
-    Py_END_CRITICAL_SECTION();
-}