Implement JNI upcall for ctx_GetAttr_s

Author: fangerer

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

@@ -106,7 +106,8 @@ ALL_FIELDS
     UPCALL(Is, SIG_HPY SIG_HPY, SIG_INT) \
     UPCALL(IsG, SIG_HPY SIG_HPYGLOBAL, SIG_INT) \
     UPCALL(CapsuleNew, SIG_PTR SIG_PTR SIG_PTR, SIG_HPY) \
-    UPCALL(CapsuleGet, SIG_HPY SIG_INT SIG_PTR, SIG_PTR)
+    UPCALL(CapsuleGet, SIG_HPY SIG_INT SIG_PTR, SIG_PTR) \
+    UPCALL(GetAttrs, SIG_HPY SIG_STRING, SIG_HPY)
 
 
 #define UPCALL(name, jniSigArgs, jniSigRet) static jmethodID jniMethod_ ## name;
@@ -374,6 +375,11 @@ static HPy ctx_GetItem_s_jni(HPyContext *ctx, HPy target, const char *name) {
     return DO_UPCALL_HPY(CONTEXT_INSTANCE(ctx), GetItems, target, jname);
 }
 
+static HPy ctx_GetAttr_s_jni(HPyContext *ctx, HPy target, const char *name) {
+    jstring jname = (*jniEnv)->NewStringUTF(jniEnv, name);
+    return DO_UPCALL_HPY(CONTEXT_INSTANCE(ctx), GetAttrs, target, jname);
+}
+
 static HPy ctx_Type_jni(HPyContext *ctx, HPy obj) {
     return DO_UPCALL_HPY(CONTEXT_INSTANCE(ctx), Type, HPY_UP(obj));
 }
@@ -888,6 +894,7 @@ JNIEXPORT jint JNICALL Java_com_oracle_graal_python_builtins_objects_cext_hpy_Gr
     context->ctx_Is_g = ctx_Is_g_jni;
     context->ctx_Capsule_New = ctx_Capsule_New_jni;
     context->ctx_Capsule_Get = ctx_Capsule_Get_jni;
+    context->ctx_GetAttr_s = ctx_GetAttr_s_jni;
 
     graal_hpy_context_get_native_context(context)->jni_context = (void *) (*env)->NewGlobalRef(env, ctx);
     assert(clazz != NULL);

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

@@ -83,6 +83,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Level;
 
+import com.oracle.graal.python.lib.PyObjectGetAttr;
 import org.graalvm.nativeimage.ImageInfo;
 
 import com.oracle.graal.python.PythonLanguage;
@@ -1723,7 +1724,8 @@ public enum Counter {
         UpcallGlobalStore,
         UpcallType,
         UpcallTypeGetName,
-        UpcallContextVarGet;
+        UpcallContextVarGet,
+        UpcallGetAttrS;
 
         @CompilationFinal(dimensions = 1) private static final Counter[] VALUES = values();
     }
@@ -1811,17 +1813,11 @@ public long ctxAsStruct(long handle) {
 
     // Note: assumes that receiverHandle is not a boxed primitive value
     @SuppressWarnings("try")
-    public final int ctxSetItems(long receiverHandle, String name, long valueHandle) {
+    public int ctxSetItems(long receiverHandle, String name, long valueHandle) {
         increment(Counter.UpcallSetItemS);
         Object receiver = getObjectForHPyHandle(GraalHPyBoxing.unboxHandle(receiverHandle));
-        Object value;
-        if (GraalHPyBoxing.isBoxedHandle(valueHandle)) {
-            value = getObjectForHPyHandle(GraalHPyBoxing.unboxHandle(valueHandle));
-        } else if (GraalHPyBoxing.isBoxedInt(valueHandle)) {
-            value = GraalHPyBoxing.unboxInt(valueHandle);
-        } else if (GraalHPyBoxing.isBoxedDouble(valueHandle)) {
-            value = GraalHPyBoxing.unboxDouble(valueHandle);
-        } else {
+        Object value = bitsAsPythonObject(valueHandle);
+        if (value == GraalHPyHandle.NULL_HANDLE_DELEGATE) {
             HPyRaiseNode.raiseIntUncached(this, -1, SystemError, ErrorMessages.HPY_UNEXPECTED_HPY_NULL);
             return -1;
         }
@@ -2449,6 +2445,32 @@ public long ctxCapsuleGet(long capsuleBits, int key, long namePtr) {
         }
     }
 
+    public long ctxGetAttrs(long receiverHandle, String name) {
+        increment(Counter.UpcallGetAttrS);
+        Object receiver = bitsAsPythonObject(receiverHandle);
+        TruffleString tsName = toTruffleStringUncached(name);
+        Object result;
+        try {
+            result = PyObjectGetAttr.getUncached().execute(null, receiver, tsName);
+        } catch (PException e) {
+            HPyTransformExceptionToNativeNode.executeUncached(this, e);
+            return 0;
+        }
+        return GraalHPyBoxing.boxHandle(getHPyHandleForObject(result));
+    }
+
+    private Object bitsAsPythonObject(long bits) {
+        if (GraalHPyBoxing.isBoxedNullHandle(bits)) {
+            return GraalHPyHandle.NULL_HANDLE_DELEGATE;
+        } else if (GraalHPyBoxing.isBoxedInt(bits)) {
+            return GraalHPyBoxing.unboxInt(bits);
+        } else if (GraalHPyBoxing.isBoxedDouble(bits)) {
+            return GraalHPyBoxing.unboxDouble(bits);
+        }
+        assert GraalHPyBoxing.isBoxedHandle(bits);
+        return getObjectForHPyHandle(GraalHPyBoxing.unboxHandle(bits));
+    }
+
     @ExportMessage
     @SuppressWarnings("static-method")
     boolean hasMembers() {

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

@@ -39,6 +39,7 @@
     {"name":"ctxIsG","parameterTypes":["long", "long"] },
     {"name":"ctxCapsuleNew","parameterTypes":["long", "long", "long"] },
     {"name":"ctxCapsuleGet","parameterTypes":["long", "int", "long"] },
+    {"name":"ctxGetAttrs","parameterTypes":["long", "java.lang.String"] },
     {"name":"getHPyDebugContext","parameterTypes":[] }
   ],
   "fields":[