MNT: move references to int(1) and int(0) to global static struct

Author: ngoldbaum

numpy/_core/src/multiarray/convert_datatype.c

@@ -2167,7 +2167,6 @@ PyArray_Zero(PyArrayObject *arr)
 {
     char *zeroval;
     int ret, storeflags;
-    static PyObject * zero_obj = NULL;
 
     if (_check_object_rec(PyArray_DESCR(arr)) < 0) {
         return NULL;
@@ -2178,25 +2177,19 @@ PyArray_Zero(PyArrayObject *arr)
         return NULL;
     }
 
-    if (zero_obj == NULL) {
-        zero_obj = PyLong_FromLong((long) 0);
-        if (zero_obj == NULL) {
-            return NULL;
-        }
-    }
     if (PyArray_ISOBJECT(arr)) {
         /* XXX this is dangerous, the caller probably is not
            aware that zeroval is actually a static PyObject*
            In the best case they will only use it as-is, but
            if they simply memcpy it into a ndarray without using
            setitem(), refcount errors will occur
         */
-        memcpy(zeroval, &zero_obj, sizeof(PyObject *));
+        memcpy(zeroval, &npy_ma_global_data->zero_obj, sizeof(PyObject *));
         return zeroval;
     }
     storeflags = PyArray_FLAGS(arr);
     PyArray_ENABLEFLAGS(arr, NPY_ARRAY_BEHAVED);
-    ret = PyArray_SETITEM(arr, zeroval, zero_obj);
+    ret = PyArray_SETITEM(arr, zeroval, npy_ma_global_data->zero_obj);
     ((PyArrayObject_fields *)arr)->flags = storeflags;
     if (ret < 0) {
         PyDataMem_FREE(zeroval);
@@ -2213,7 +2206,6 @@ PyArray_One(PyArrayObject *arr)
 {
     char *oneval;
     int ret, storeflags;
-    static PyObject * one_obj = NULL;
 
     if (_check_object_rec(PyArray_DESCR(arr)) < 0) {
         return NULL;
@@ -2224,26 +2216,20 @@ PyArray_One(PyArrayObject *arr)
         return NULL;
     }
 
-    if (one_obj == NULL) {
-        one_obj = PyLong_FromLong((long) 1);
-        if (one_obj == NULL) {
-            return NULL;
-        }
-    }
     if (PyArray_ISOBJECT(arr)) {
         /* XXX this is dangerous, the caller probably is not
            aware that oneval is actually a static PyObject*
            In the best case they will only use it as-is, but
            if they simply memcpy it into a ndarray without using
            setitem(), refcount errors will occur
         */
-        memcpy(oneval, &one_obj, sizeof(PyObject *));
+        memcpy(oneval, &npy_ma_global_data->one_obj, sizeof(PyObject *));
         return oneval;
     }
 
     storeflags = PyArray_FLAGS(arr);
     PyArray_ENABLEFLAGS(arr, NPY_ARRAY_BEHAVED);
-    ret = PyArray_SETITEM(arr, oneval, one_obj);
+    ret = PyArray_SETITEM(arr, oneval, npy_ma_global_data->one_obj);
     ((PyArrayObject_fields *)arr)->flags = storeflags;
     if (ret < 0) {
         PyDataMem_FREE(oneval);

numpy/_core/src/multiarray/multiarraymodule.c

@@ -5008,6 +5008,16 @@ initialize_static_globals(void)
         }
     }
 
+    npy_ma_global_data->one_obj = PyLong_FromLong((long) 1);
+    if (npy_ma_global_data->one_obj == NULL) {
+        return -1;
+    }
+
+    npy_ma_global_data->zero_obj = PyLong_FromLong((long) 0);
+    if (npy_ma_global_data->zero_obj == NULL) {
+        return -1;
+    }
+
     return 0;
 }
 

numpy/_core/src/multiarray/multiarraymodule.h

@@ -44,6 +44,13 @@ typedef struct npy_ma_global_data_struct {
     PyObject *ndarray_array_ufunc;
     PyObject *ndarray_array_finalize;
     PyObject *ndarray_array_function;
+
+    /*
+     * References to the '1' and '0' PyLong objects
+     */
+    PyObject *one_obj;
+    PyObject *zero_obj;
+
     /*
      * References to items obtained via an import at module initialization
      *