Let upcall function ctxTupleFromArray close handles

Author: fangerer

graalpython/com.oracle.graal.python.jni/src/ctx_builder.c

@@ -46,8 +46,7 @@
  */
 
 
-#include <stddef.h>
-#include "hpy.h"
+#include "hpy_jni.h"
 
 typedef struct {
     HPy_ssize_t capacity;  // allocated handles
@@ -121,11 +120,7 @@ ctx_TupleBuilder_Build(HPyContext *ctx, HPyTupleBuilder builder)
         HPyErr_NoMemory(ctx);
         return HPy_NULL;
     }
-    /* TODO(fa): we could have an internal upcall that steals the references */
-    HPy res = HPyTuple_FromArray(ctx, hb->handles, hb->capacity);
-    for (HPy_ssize_t i = 0; i < hb->capacity; i++) {
-        HPy_Close(ctx, hb->handles[i]);
-    }
+    HPy res = upcallTupleFromArray(ctx, hb->handles, hb->capacity, JNI_TRUE);
     free(hb);
     return res;
 }

graalpython/com.oracle.graal.python.jni/src/hpy_jni.c

@@ -39,7 +39,8 @@
  * SOFTWARE.
  */
 
-#include <hpy.h>
+#include "hpy_jni.h"
+
 #include <wchar.h>
 #include <assert.h>
 #include <stdio.h>
@@ -59,7 +60,6 @@
 
 #include "com_oracle_graal_python_builtins_objects_cext_hpy_GraalHPyContext.h"
 #include "hpynative.h"
-#include <jni.h>
 
 /* definitions for HPyTracker */
 #include "hpy/runtime/ctx_funcs.h"
@@ -430,17 +430,22 @@ static HPy augment_UnicodeFromWideChar(HPyContext *ctx, const wchar_t *u, HPy_ss
     }
 }
 
-static HPy augment_TupleFromArray(HPyContext *ctx, HPy *items, HPy_ssize_t nitems) {
+_HPy_HIDDEN HPy upcallTupleFromArray(HPyContext *ctx, HPy *items, HPy_ssize_t nitems, jboolean steal) {
     jarray jLongArray = (*jniEnv)->NewLongArray(jniEnv, (jsize) nitems);
     jlong *content = (*jniEnv)->GetPrimitiveArrayCritical(jniEnv, jLongArray, 0);
     HPy_ssize_t i;
     for (i = 0; i < nitems; i++) {
         content[i] = (jlong) toBits(items[i]);
     }
     (*jniEnv)->ReleasePrimitiveArrayCritical(jniEnv, jLongArray, content, 0);
-    return DO_UPCALL_HPY(CONTEXT_INSTANCE(ctx), TupleFromArray, jLongArray, JNI_FALSE);
+    return DO_UPCALL_HPY(CONTEXT_INSTANCE(ctx), TupleFromArray, jLongArray, steal);
+}
+
+static HPy augment_TupleFromArray(HPyContext *ctx, HPy *items, HPy_ssize_t nitems) {
+    return upcallTupleFromArray(ctx, items, nitems, JNI_FALSE);
 }
 
+
 void initDirectFastPaths(HPyContext *context) {
     LOG("%p", context);
     context->name = "HPy Universal ABI (GraalVM backend, JNI)";

graalpython/com.oracle.graal.python.jni/src/hpy_jni.h

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*
+ * Native implementation of HPyTupleBuilder.
+ * This is written in a way that we could also use the internal functions
+ * 'builder_*' to implement HPyListBuilder.
+ */
+
+#include <hpy.h>
+#include <jni.h>
+
+_HPy_HIDDEN HPy upcallTupleFromArray(HPyContext *ctx, HPy *items, HPy_ssize_t nitems, jboolean steal);