MAINT: apply more of Sebastian's suggestions

Author: ngoldbaum

numpy/_core/src/multiarray/multiarraymodule.c

@@ -5044,10 +5044,19 @@ PyMODINIT_FUNC PyInit__multiarray_umath(void) {
     // initialize static references to ndarray.__array_*__ special methods
     npy_static_pydata.ndarray_array_finalize = PyObject_GetAttrString(
             (PyObject *)&PyArray_Type, "__array_finalize__");
+    if (npy_static_pydata.ndarray_array_finalize == NULL) {
+        goto err;
+    }
     npy_static_pydata.ndarray_array_ufunc = PyObject_GetAttrString(
             (PyObject *)&PyArray_Type, "__array_ufunc__");
+    if (npy_static_pydata.ndarray_array_ufunc == NULL) {
+        goto err;
+    }
     npy_static_pydata.ndarray_array_function = PyObject_GetAttrString(
             (PyObject *)&PyArray_Type, "__array_function__");
+    if (npy_static_pydata.ndarray_array_function == NULL) {
+        goto err;
+    }
 
     /*
      * Initialize np.dtypes.StringDType
@@ -5088,6 +5097,15 @@ PyMODINIT_FUNC PyInit__multiarray_umath(void) {
         goto err;
     }
 
+    // initialize static reference to a zero-like array
+    npy_static_pydata.zero_pyint_like_arr = PyArray_ZEROS(
+            0, NULL, NPY_LONG, NPY_FALSE);
+    if (npy_static_pydata.zero_pyint_like_arr == NULL) {
+        goto err;
+    }
+    ((PyArrayObject_fields *)npy_static_pydata.zero_pyint_like_arr)->flags |=
+            (NPY_ARRAY_WAS_PYTHON_INT|NPY_ARRAY_WAS_INT_AND_REPLACED);
+
     if (verify_static_structs_initialized() < 0) {
         goto err;
     }

numpy/_core/src/multiarray/npy_static_data.c

@@ -154,7 +154,7 @@ initialize_static_globals(void)
     IMPORT_GLOBAL("os", "PathLike",
                   npy_static_pydata.os_PathLike);
 
-    // default_truediv_type_tupS
+    // default_truediv_type_tup
     PyArray_Descr *tmp = PyArray_DescrFromType(NPY_DOUBLE);
     npy_static_pydata.default_truediv_type_tup =
             PyTuple_Pack(3, tmp, tmp, tmp);

numpy/_core/src/multiarray/npy_static_data.h

@@ -79,6 +79,11 @@ typedef struct npy_static_pydata_struct {
     PyObject *one_obj;
     PyObject *zero_obj;
 
+    /*
+     * Reference to an np.array(0, dtype=np.long) instance
+     */
+    PyObject *zero_pyint_like_arr;
+
     /*
      * References to items obtained via an import at module initialization
      */

numpy/_core/src/umath/override.c

@@ -373,14 +373,13 @@ PyUFunc_CheckOverride(PyUFuncObject *ufunc, char *method,
                     "numpy._core._internal",
                     "array_ufunc_errmsg_formatter",
                     &npy_thread_unsafe_state.array_ufunc_errmsg_formatter);
-            if (npy_thread_unsafe_state.array_ufunc_errmsg_formatter != NULL) {
-                errmsg = PyObject_Call(
-                        npy_thread_unsafe_state.array_ufunc_errmsg_formatter,
-                        override_args, normal_kwds);
-                if (errmsg != NULL) {
-                    PyErr_SetObject(PyExc_TypeError, errmsg);
-                    Py_DECREF(errmsg);
-                }
+            assert(npy_thread_unsafe_state.array_ufunc_errmsg_formatter != NULL);
+            errmsg = PyObject_Call(
+                    npy_thread_unsafe_state.array_ufunc_errmsg_formatter,
+                    override_args, normal_kwds);
+            if (errmsg != NULL) {
+                PyErr_SetObject(PyExc_TypeError, errmsg);
+                Py_DECREF(errmsg);
             }
             Py_DECREF(override_args);
             goto fail;

numpy/_core/src/umath/ufunc_object.c

@@ -700,15 +700,9 @@ convert_ufunc_arguments(PyUFuncObject *ufunc,
                  * TODO: Just like the general dual NEP 50/legacy promotion
                  * support this is meant as a temporary hack for NumPy 1.25.
                  */
-                PyArrayObject *zero_arr = (PyArrayObject *)PyArray_ZEROS(
-                        0, NULL, NPY_LONG, NPY_FALSE);
-                if (zero_arr == NULL) {
-                    goto fail;
-                }
-                ((PyArrayObject_fields *)zero_arr)->flags |= (
-                        NPY_ARRAY_WAS_PYTHON_INT|NPY_ARRAY_WAS_INT_AND_REPLACED);
-                Py_INCREF(zero_arr);
-                Py_SETREF(out_op[i], zero_arr);
+                Py_INCREF(npy_static_pydata.zero_pyint_like_arr);
+                Py_SETREF(out_op[i],
+                          (PyArrayObject *)npy_static_pydata.zero_pyint_like_arr);
             }
             *promoting_pyscalars = NPY_TRUE;
         }