Fix: do full 'native_to_java' resolving except for 'int' and 'long'.

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/capi.c

@@ -209,6 +209,7 @@ void* native_pointer_to_java(PyObject* obj) {
     } else if (!truffle_cannot_be_handle(obj)) {
         return resolve_handle(cache, (uint64_t)obj);
     }
+    return obj;
 }
 
 __attribute__((always_inline))

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

@@ -592,7 +592,8 @@ public abstract static class ToJavaNode extends CExtBaseNode {
         @Child private PCallNativeNode callNativeNode;
         @Child private AsPythonObjectNode toJavaNode = AsPythonObjectNode.create();
 
-        @CompilationFinal TruffleObject nativeToJavaFunction;
+        @CompilationFinal private TruffleObject nativeToJavaFunction;
+        @CompilationFinal private TruffleObject nativePointerToJavaFunction;
 
         public abstract Object execute(Object value);
 
@@ -626,25 +627,48 @@ boolean doBoolean(boolean b) {
             return b;
         }
 
+        @Specialization
+        Object doInt(int i) {
+            // Unfortunately, an int could be a native pointer and therefore a handle. So, we must
+            // try resolving it. At least we know that it's not a native type.
+            return native_pointer_to_java(i);
+        }
+
+        @Specialization
+        Object doLong(long l) {
+            // Unfortunately, a long could be a native pointer and therefore a handle. So, we must
+            // try resolving it. At least we know that it's not a native type.
+            return native_pointer_to_java(l);
+        }
+
         @Specialization
         byte doLong(byte b) {
             return b;
         }
 
         @Fallback
         Object doForeign(Object value) {
-            if (callNativeNode == null) {
+            if (nativeToJavaFunction == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                callNativeNode = insert(PCallNativeNode.create());
+                nativeToJavaFunction = importCAPISymbol(NativeCAPISymbols.FUN_NATIVE_TO_JAVA);
             }
-            if (callNativeNode == null) {
+            return call_native_conversion(nativeToJavaFunction, value);
+        }
+
+        private Object native_pointer_to_java(Object value) {
+            if (nativePointerToJavaFunction == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
+                nativePointerToJavaFunction = importCAPISymbol(NativeCAPISymbols.FUN_NATIVE_POINTER_TO_JAVA);
             }
-            if (nativeToJavaFunction == null) {
+            return call_native_conversion(nativePointerToJavaFunction, value);
+        }
+
+        private Object call_native_conversion(TruffleObject target, Object value) {
+            if (callNativeNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                nativeToJavaFunction = importCAPISymbol(NativeCAPISymbols.FUN_NATIVE_TO_JAVA);
+                callNativeNode = insert(PCallNativeNode.create());
             }
-            return toJavaNode.execute(callNativeNode.execute(nativeToJavaFunction, new Object[]{value}));
+            return toJavaNode.execute(callNativeNode.execute(target, new Object[]{value}));
         }
 
         public static ToJavaNode create() {

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

@@ -42,7 +42,8 @@
 
 public abstract class NativeCAPISymbols {
 
-    public static final String FUN_NATIVE_TO_JAVA = "native_pointer_to_java";
+    public static final String FUN_NATIVE_POINTER_TO_JAVA = "native_pointer_to_java";
+    public static final String FUN_NATIVE_TO_JAVA = "native_to_java_exported";
     public static final String FUN_PY_TRUFFLE_STRING_TO_CSTR = "PyTruffle_StringToCstr";
     public static final String FUN_PY_OBJECT_HANDLE_FOR_JAVA_OBJECT = "PyObjectHandle_ForJavaObject";
     public static final String FUN_PY_OBJECT_HANDLE_FOR_JAVA_TYPE = "PyObjectHandle_ForJavaType";