Use new Sulong intrinsic 'truffle_cannot_be_handle'.

Author: fangerer

graalpython/com.oracle.graal.python.cext/include/truffle.h

@@ -52,6 +52,7 @@ void *truffle_managed_from_handle(void *nativeHandle);
 bool truffle_is_handle_to_managed(void *nativeHandle);
 void *truffle_assign_managed(void *dst, void *managed);
 void *truffle_deref_handle_for_managed(void *managed);
+bool truffle_cannot_be_handle(void *nativeHandle);
 
 /*
  * All function below here are deprecated and will be removed in a future release.

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

@@ -215,12 +215,12 @@ PyObject* to_sulong(void *o) {
 /** to be used from Java code only; reads native 'ob_type' field */
 void* get_ob_type(PyObject* obj) {
     PyTypeObject*  type = obj->ob_type;
-    if (truffle_is_handle_to_managed(type)) {
+    if (!truffle_cannot_be_handle(type)) {
         return resolve_handle(cache, (uint64_t)type);
     } else {
         // we have stored a handle to the Java class in ob_refcnt
         void* handle = (void*)((PyObject*)type)->ob_refcnt;
-        if (truffle_is_handle_to_managed(handle)) {
+        if (!truffle_cannot_be_handle(handle)) {
             return resolve_handle(cache, (uint64_t)handle);
         } else {
             // assume handle is a TruffleObject
@@ -248,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_cannot_be_handle(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_cannot_be_handle(ptype)) {
         return truffle_deref_handle_for_managed(ptype);
     }
     return ptype;

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

@@ -166,11 +166,11 @@ inline void* native_to_java(PyObject* obj) {
         return Py_None;
     } else if (polyglot_is_string(obj)) {
         return obj;
-    } else if (truffle_is_handle_to_managed(obj)) {
+    } else if (!truffle_cannot_be_handle(obj)) {
         return resolve_handle(cache, (uint64_t)obj);
     } else {
         void* refcnt = obj->ob_refcnt;
-        if (truffle_is_handle_to_managed(refcnt)) {
+        if (!truffle_cannot_be_handle(refcnt)) {
             return resolve_handle(cache, refcnt);
         } else if (IS_POINTER(refcnt)) {
             return refcnt;

mx.graalpython/suite.py

@@ -25,15 +25,15 @@
             },
             {
                 "name": "sulong",
-                "version": "588b2880ed6a7575179cc771776f4a87f16783e3",
+                "version": "a8a599d132146bb0f87a2b95572db7d76b641b88",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "588b2880ed6a7575179cc771776f4a87f16783e3",
+                "version": "a8a599d132146bb0f87a2b95572db7d76b641b88",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},