Revert "Try to add thread safety to pointer_type"

This reverts commit 62d2deb.

Author: sergey-miryanov

Modules/_ctypes/_ctypes.c

@@ -588,9 +588,8 @@ ctype_get_pointer_type(PyObject *self, void *Py_UNUSED(ignored))
         return NULL;
     }
 
-    PyObject* pointer_type = FT_ATOMIC_LOAD_PTR_ACQUIRE(info->pointer_type);
-    if (pointer_type) {
-        return Py_NewRef(pointer_type);
+    if (info->pointer_type) {
+        return Py_NewRef(info->pointer_type);
     }
     Py_RETURN_NONE;
 }
@@ -1228,39 +1227,26 @@ PyCPointerType_SetProto(ctypes_state *st, PyObject *self, StgInfo *stginfo, PyOb
         PyErr_Format(PyExc_TypeError, "%R must have storage info", proto);
         return -1;
     }
-
-    PyObject* pointer_type = FT_ATOMIC_LOAD_PTR_ACQUIRE(info->pointer_type);
-    PyObject* stginfo_proto = FT_ATOMIC_LOAD_PTR_ACQUIRE(stginfo->proto);
-
-    if (pointer_type && pointer_type != self) {
+    if (info->pointer_type && info->pointer_type != self) {
         PyErr_Format(PyExc_TypeError,
             "pointer type already set: old=%R, new=%R",
-            pointer_type, self);
+            info->pointer_type, self);
         return -1;
     }
-    if (stginfo_proto && stginfo_proto != proto) {
+    if (stginfo->proto && stginfo->proto != proto) {
         PyErr_Format(PyExc_TypeError,
             "cls type already set: old=%R, new=%R",
-            stginfo_proto, proto);
+            stginfo->proto, proto);
         return -1;
     }
 
-    if (!stginfo_proto || !pointer_type) {
-        STGINFO2_LOCK(stginfo, info);
-
-        stginfo_proto = FT_ATOMIC_LOAD_PTR_ACQUIRE(stginfo->proto);
-        if (!stginfo_proto) {
-            FT_ATOMIC_STORE_PTR_RELEASE(stginfo->proto, Py_NewRef(proto));
-        }
-
-        pointer_type = FT_ATOMIC_LOAD_PTR_ACQUIRE(info->pointer_type);
-        if (!pointer_type) {
-            FT_ATOMIC_STORE_PTR_RELEASE(info->pointer_type, Py_NewRef(self));
-        }
-
-        STGINFO2_UNLOCK();
+    if (!stginfo->proto) {
+        stginfo->proto = Py_NewRef(proto);
     }
 
+    if (!info->pointer_type) {
+        info->pointer_type = Py_NewRef(self);
+    }
     return 0;
 }
 

Modules/_ctypes/ctypes.h

@@ -422,10 +422,6 @@ typedef struct {
 #define STGINFO_LOCK(stginfo)   Py_BEGIN_CRITICAL_SECTION_MUT(&(stginfo)->mutex)
 #define STGINFO_UNLOCK()        Py_END_CRITICAL_SECTION()
 
-#define STGINFO2_LOCK(stginfo_a, stginfo_b)   \
-    Py_BEGIN_CRITICAL_SECTION2_MUT(&(stginfo_a)->mutex, &(stginfo_b)->mutex)
-#define STGINFO2_UNLOCK()       Py_END_CRITICAL_SECTION2()
-
 static inline uint8_t
 stginfo_get_dict_final(StgInfo *info)
 {