Pull request numpy#71: Introduce array_destroy.

fangerer · fangerer · commit 52e6974885cd · 2022-06-01T14:19:35.000Z
Merge in ~STEPAN.SINDELAR_ORACLE.COM/numpy-hpy from fa/array_destroy to labs-hpy-port

* commit '308c18df23b9ce2ba6d3e1e380307e3616bd7081':
  Introduce array_destroy; move cache free from finalize to destroy
  Fix another leak in hpy_get_view_from_index
diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c
@@ -705,12 +705,24 @@ array_finalize_impl(HPyContext *ctx, HPy h_self)
         }
     }
 
+    // TODO HPY LABS PORT: moved to array_destroy
     /* must match allocation in PyArray_NewFromDescr */
-    npy_free_cache_dim(fa->dimensions, 2 * fa->nd);
+    // npy_free_cache_dim(fa->dimensions, 2 * fa->nd);
 
     // PyErr_Restore(error_type, error_value, error_traceback);
 }
 
+/* array object functions */
+HPyDef_SLOT(array_destroy, array_destroy_impl, HPy_tp_destroy)
+static void
+array_destroy_impl(void *data)
+{
+    PyArrayObject_fields *fa = (PyArrayObject_fields *)data;
+
+    /* must match allocation in PyArray_NewFromDescr */
+    npy_free_cache_dim(fa->dimensions, 2 * fa->nd);
+}
+
 HPyDef_SLOT(array_traverse, array_traverse_impl, HPy_tp_traverse)
 static int
 array_traverse_impl(void *self, HPyFunc_visitproc visit, void *arg)
@@ -2085,6 +2097,7 @@ static HPyDef *array_defines[] = {
     &array_new,
     &array_traverse,
     &array_finalize,
+    &array_destroy,
     &array_inplace_add,
     &array_power,
     &array_subtract,
diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c
@@ -1677,6 +1677,8 @@ hpy_get_view_from_index(HPyContext *ctx, HPy h_self, PyArrayObject *self, HPy *v
             PyArray_FLAGS(self),
             ensure_array ? HPy_NULL : h_self,
             h_self);
+    HPy_Close(ctx, h_descr);
+    HPy_Close(ctx, h_type);
     if (HPy_IsNull(*view)) {
         return -1;
     }

Original file line number	Diff line number	Diff line change
`@@ -1677,6 +1677,8 @@ hpy_get_view_from_index(HPyContext ctx, HPy h_self, PyArrayObject self, HPy *v`
`1677`	`1677`	`PyArray_FLAGS(self),`
`1678`	`1678`	`ensure_array ? HPy_NULL : h_self,`
`1679`	`1679`	`h_self);`
	`1680`	`+ HPy_Close(ctx, h_descr);`
	`1681`	`+ HPy_Close(ctx, h_type);`
`1680`	`1682`	`if (HPy_IsNull(*view)) {`
`1681`	`1683`	`return -1;`
`1682`	`1684`	`}`