Implement JNI upcall for ctx_(List/Dict)New

Author: fangerer

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

@@ -82,12 +82,15 @@ static JNIEnv* jniEnv;
     UPCALL(ListCheck, SIG_HPY, SIG_INT) \
     UPCALL(UnicodeFromWideChar, SIG_PTR SIG_SIZE_T, SIG_HPY) \
     UPCALL(UnicodeFromJCharArray, SIG_JCHARARRAY, SIG_HPY) \
+    UPCALL(DictNew, , SIG_HPY) \
+    UPCALL(ListNew, SIG_SIZE_T, SIG_HPY) \
 
 #define UPCALL(name, jniSigArgs, jniSigRet) static jmethodID jniMethod_ ## name;
 ALL_UPCALLS
 #undef UPCALL
 
 #define DO_UPCALL_HPY(jni_ctx, name, ...) ((HPy){(HPy_ssize_t)(*jniEnv)->CallLongMethod(jniEnv, (jni_ctx), jniMethod_ ## name, __VA_ARGS__)})
+#define DO_UPCALL_HPY_NOARGS(jni_ctx, name) ((HPy){(HPy_ssize_t)(*jniEnv)->CallLongMethod(jniEnv, (jni_ctx), jniMethod_ ## name)})
 #define DO_UPCALL_TRACKER(jni_ctx, name, ...) ((HPyTracker){(*jniEnv)->CallLongMethod(jniEnv, (jni_ctx), jniMethod_ ## name, __VA_ARGS__)})
 #define DO_UPCALL_PTR(jni_ctx, name, ...) (void*) (*jniEnv)->CallLongMethod(jniEnv, (jni_ctx), jniMethod_ ## name, __VA_ARGS__)
 #define DO_UPCALL_SIZE_T(jni_ctx, name, ...) (HPy_ssize_t) (*jniEnv)->CallLongMethod(jniEnv, (jni_ctx), jniMethod_ ## name, __VA_ARGS__)
@@ -170,6 +173,14 @@ static HPy ctx_Unicode_FromWideChar_jni(HPyContext ctx, const wchar_t *arr, HPy_
     return DO_UPCALL_HPY(CONTEXT_INSTANCE(ctx), UnicodeFromWideChar, (PTR_UP) arr, (SIZE_T_UP) idx);
 }
 
+static HPy ctx_DictNew_jni(HPyContext ctx) {
+    return DO_UPCALL_HPY_NOARGS(CONTEXT_INSTANCE(ctx), DictNew);
+}
+
+static HPy ctx_ListNew_jni(HPyContext ctx, HPy_ssize_t len) {
+    return DO_UPCALL_HPY(CONTEXT_INSTANCE(ctx), ListNew, (SIZE_T_UP) len);
+}
+
 //*************************
 // BOXING
 
@@ -466,6 +477,9 @@ JNIEXPORT jint JNICALL Java_com_oracle_graal_python_builtins_objects_cext_hpy_Gr
 
     context->ctx_Unicode_FromWideChar = ctx_Unicode_FromWideChar_jni;
 
+    context->ctx_Dict_New = ctx_DictNew_jni;
+    context->ctx_List_New = ctx_ListNew_jni;
+
     context->ctx_Tracker_New = ctx_Tracker_New;
     context->ctx_Tracker_Add = ctx_Tracker_Add;
     context->ctx_Tracker_ForgetAll = ctx_Tracker_ForgetAll;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContext.java

@@ -185,6 +185,7 @@
 import com.oracle.graal.python.nodes.expression.TernaryArithmetic;
 import com.oracle.graal.python.nodes.expression.UnaryArithmetic;
 import com.oracle.graal.python.nodes.object.GetClassNode;
+import com.oracle.graal.python.nodes.util.CastToJavaIntExactNode;
 import com.oracle.graal.python.runtime.AsyncHandler;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonOptions;
@@ -1235,7 +1236,9 @@ public enum Counter {
         UpcallFloatAsDouble,
         UpcallFloatFromDouble,
         UpcallUnicodeFromWideChar,
-        UpcallUnicodeFromJCharArray;
+        UpcallUnicodeFromJCharArray,
+        UpcallDictNew,
+        UpcallListNew;
 
         long count;
 
@@ -1626,6 +1629,27 @@ public final long ctxUnicodeFromJCharArray(char[] arr) {
         return createHandle(new String(arr, 0, arr.length)).getId(this, ConditionProfile.getUncached());
     }
 
+    public final long ctxDictNew() {
+        Counter.UpcallDictNew.increment();
+        PDict dict = PythonObjectFactory.getUncached().createDict();
+        return createHandle(dict).getId(this, ConditionProfile.getUncached());
+    }
+
+    public final long ctxListNew(long llen) {
+        try {
+            Counter.UpcallListNew.increment();
+            int len = CastToJavaIntExactNode.getUncached().execute(llen);
+            Object[] data = new Object[len];
+            Arrays.fill(data, PNone.NONE);
+            PList list = PythonObjectFactory.getUncached().createList(data);
+            return createHandle(list).getId(this, ConditionProfile.getUncached());
+        } catch (PException e) {
+            HPyTransformExceptionToNativeNodeGen.getUncached().execute(this, e);
+            // NULL handle
+            return 0;
+        }
+    }
+
     @ExportMessage
     @SuppressWarnings("static-method")
     final boolean hasMembers() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/resources/jni-config.json

@@ -4,6 +4,7 @@
   "methods":[
     {"name":"ctxCast","parameterTypes":["long"] }, 
     {"name":"ctxClose","parameterTypes":["long"] }, 
+    {"name":"ctxDictNew","parameterTypes":[] }, 
     {"name":"ctxDup","parameterTypes":["long"] }, 
     {"name":"ctxFloatAsDouble","parameterTypes":["long"] }, 
     {"name":"ctxFloatFromDouble","parameterTypes":["double"] }, 
@@ -12,6 +13,7 @@
     {"name":"ctxSetItemi","parameterTypes":["long","long","long"] }, 
     {"name":"ctxLength","parameterTypes":["long"] }, 
     {"name":"ctxListCheck","parameterTypes":["long"] }, 
+    {"name":"ctxListNew","parameterTypes":["long"] }, 
     {"name":"ctxLongAsLong","parameterTypes":["long"] }, 
     {"name":"ctxLongFromLong","parameterTypes":["long"] },
     {"name":"ctxNew","parameterTypes":["long","long"] },