Pull request numpy#69: Do not steal handle in coercion cache.

fangerer · fangerer · commit 7dc6242974c9 · 2022-05-31T09:52:19.000Z
Merge in ~STEPAN.SINDELAR_ORACLE.COM/numpy-hpy from fa/final_fixes to labs-hpy-port

* commit 'a280ef2dc1d5a15dc74534a65376c0a909a1e8f9':
  Fix: do not steal handle in coercing cache
  Reorder array slots to use right impls for magic methods
diff --git a/numpy/core/src/multiarray/array_coercion.c b/numpy/core/src/multiarray/array_coercion.c
@@ -704,8 +704,8 @@ hnpy_new_coercion_cache(HPyContext *ctx,
         PyErr_NoMemory();
         return -1;
     }
-    cache->converted_obj = converted_obj;
-    cache->arr_or_sequence = arr_or_sequence;
+    cache->converted_obj = HPy_Dup(ctx, converted_obj);
+    cache->arr_or_sequence = HPy_Dup(ctx, arr_or_sequence);
     cache->sequence = sequence;
     cache->depth = ndim;
     cache->next = NULL;
@@ -727,7 +727,10 @@ npy_new_coercion_cache(
     Py_XDECREF(converted_obj); /* the object is stolen */
     HPy h_arr_or_sequence = HPy_FromPyObject(ctx, arr_or_sequence);
     Py_XDECREF(arr_or_sequence); /* the object is stolen */
-    return hnpy_new_coercion_cache(ctx, h_converted_obj, h_arr_or_sequence, sequence, next_ptr, ndim);
+    int res = hnpy_new_coercion_cache(ctx, h_converted_obj, h_arr_or_sequence, sequence, next_ptr, ndim);
+    HPy_Close(ctx, h_converted_obj);
+    HPy_Close(ctx, h_arr_or_sequence);
+    return res;
 }
 
 /**
diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c
@@ -2074,11 +2074,12 @@ static PyType_Slot PyArray_Type_slots[] = {
 };
 
 static HPyDef *array_defines[] = {
-    &array_length,
-    &mp_array_length,
-    &array_getbuffer,
     &array_assign_subscript,
     &array_subscript,
+    &mp_array_length,
+
+    &array_getbuffer,
+    &array_length,
     &array_item,
     &array_new,
     &array_traverse,
