Fix: force-inline of 'native_to_java' did not work.

Author: fangerer

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

@@ -53,10 +53,7 @@ uint64_t (*PY_TRUFFLE_CEXT_LANDING_L)(void* name, ...);
 double (*PY_TRUFFLE_CEXT_LANDING_D)(void* name, ...);
 void* (*PY_TRUFFLE_CEXT_LANDING_PTR)(void* name, ...);
 
-typedef void* (*cache_t)(uint64_t);
-static cache_t cache;
-
-#define resolve_handle(__cache__, __addr__) (__cache__)(__addr__)
+cache_t cache;
 
 __attribute__((constructor (__COUNTER__)))
 static void initialize_upcall_functions() {
@@ -198,28 +195,6 @@ static void initialize_capi() {
     initialize_bufferprocs();
 }
 
-// Heuristic to test if some value is a pointer object
-// TODO we need a reliable solution for that
-#define IS_POINTER(__val__) (polyglot_is_value(__val__) && !polyglot_fits_in_i64(__val__))
-
-MUST_INLINE
-void* native_to_java(PyObject* obj) {
-    if (obj == NULL) {
-        return Py_NoValue;
-    } else if (obj == Py_None) {
-        return Py_None;
-    } else if (polyglot_is_string(obj)) {
-        return obj;
-    } else if (truffle_is_handle_to_managed(obj)) {
-        return resolve_handle(cache, (uint64_t)obj);
-    } else if (truffle_is_handle_to_managed(obj->ob_refcnt)) {
-        return truffle_managed_from_handle(obj->ob_refcnt);
-    } else if (IS_POINTER(obj->ob_refcnt)) {
-        return obj->ob_refcnt;
-    }
-    return obj;
-}
-
 void* native_to_java_exported(PyObject* obj) {
     return native_to_java(obj);
 }
@@ -273,15 +248,15 @@ uint64_t PyTruffle_Wchar_Size() {
 }
 
 void* PyObjectHandle_ForJavaObject(void* cobj, unsigned long flags) {
-    if (!truffle_is_handle_to_managed(cobj)) {
+    if (truffle_is_handle_to_managed(cobj)) {
         return truffle_deref_handle_for_managed(cobj);
     }
     return cobj;
 }
 
 /** to be used from Java code only; only creates the deref handle */
 void* PyObjectHandle_ForJavaType(void* ptype) {
-    if (!truffle_is_handle_to_managed(ptype)) {
+    if (truffle_is_handle_to_managed(ptype)) {
         return truffle_deref_handle_for_managed(ptype);
     }
     return ptype;

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

@@ -149,8 +149,36 @@ extern void* (*PY_TRUFFLE_CEXT_LANDING_PTR)(void* name, ...);
 #define as_double(obj) polyglot_as_double(polyglot_invoke(PY_TRUFFLE_CEXT, "to_double", to_java(obj)))
 #define as_float(obj) ((float)as_double(obj))
 
+typedef void* (*cache_t)(uint64_t);
+extern cache_t cache;
+
+// Heuristic to test if some value is a pointer object
+// TODO we need a reliable solution for that
+#define IS_POINTER(__val__) (polyglot_is_value(__val__) && !polyglot_fits_in_i64(__val__))
+
+#define resolve_handle(__cache__, __addr__) (__cache__)(__addr__)
+
+__attribute__((always_inline))
+inline void* native_to_java(PyObject* obj) {
+    if (obj == NULL) {
+        return Py_NoValue;
+    } else if (obj == Py_None) {
+        return Py_None;
+    } else if (polyglot_is_string(obj)) {
+        return obj;
+    } else if (truffle_is_handle_to_managed(obj)) {
+        return resolve_handle(cache, (uint64_t)obj);
+    } else {
+        void* refcnt = obj->ob_refcnt;
+        if (truffle_is_handle_to_managed(refcnt)) {
+            return resolve_handle(cache, refcnt);
+        } else if (IS_POINTER(refcnt)) {
+            return refcnt;
+        }
+        return obj;
+    }
+}
 
-void* native_to_java(PyObject* obj);
 extern void* to_java(PyObject* obj);
 extern void* to_java_type(PyTypeObject* cls);
 extern PyObject* to_sulong(void *o);