Migrate to new handle API

fangerer · fangerer · commit c1a5fc696039 · 2020-10-22T15:21:38.000+02:00
diff --git a/graalpython/com.oracle.graal.python.cext/hpy/hpy.c b/graalpython/com.oracle.graal.python.cext/hpy/hpy.c
@@ -348,7 +348,7 @@ void get_next_vaarg(va_list *p_va, OutVarPtr *p_outvar) {
 }
 
 void* graal_hpy_context_to_native(void* cobj) {
-    return truffle_deref_handle_for_managed(cobj);
+    return create_deref_handle(cobj);
 }
 
 #define PRIMITIVE_ARRAY_TO_NATIVE(__jtype__, __ctype__, __polyglot_type__, __element_cast__) \
diff --git a/graalpython/com.oracle.graal.python.cext/src/capi.c b/graalpython/com.oracle.graal.python.cext/src/capi.c
@@ -96,7 +96,7 @@ static void initialize_upcall_functions() {
 
 __attribute__((constructor (__COUNTER__)))
 static void initialize_handle_cache() {
-    cache = (cache_t) polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_HandleCache_Create", truffle_managed_from_handle);
+    cache = (cache_t) polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_HandleCache_Create", resolve_handle);
     ptr_cache = (ptr_cache_t) polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_PtrCache_Create", 0);
     ptr_cache_stealing = (ptr_cache_t) polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_PtrCache_Create", 1);
     type_ptr_cache = (type_ptr_cache_t) polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_PtrCache_Create", 0);
@@ -267,8 +267,8 @@ void* native_long_to_java(uint64_t val) {
         return Py_NoValue;
     } else if (obj == Py_None) {
         return Py_None;
-    } else if (!truffle_cannot_be_handle(obj)) {
-        return resolve_handle(cache, (uint64_t)obj);
+    } else if (points_to_handle_space(obj)) {
+        return resolve_handle_cached(cache, (uint64_t)obj);
     }
     return obj;
 }
@@ -451,16 +451,16 @@ uint64_t PyTruffle_Wchar_Size() {
 
 /** free's a native pointer or releases a Sulong handle; DO NOT CALL WITH MANAGED POINTERS ! */
 void PyTruffle_Free(void* obj) {
-	if(!truffle_cannot_be_handle(obj) && truffle_is_handle_to_managed(obj)) {
-		truffle_release_handle(obj);
+	if(points_to_handle_space(obj) && is_handle(obj)) {
+		release_handle(obj);
 	} else {
 		free(obj);
 	}
 }
 
 /** to be used from Java code only; creates the deref handle for a sequence wrapper */
 void* NativeHandle_ForArray(void* jobj, ssize_t element_size) {
-    return truffle_deref_handle_for_managed(jobj);
+    return create_deref_handle(jobj);
 }
 
 const char* PyTruffle_StringToCstr(void* o, int32_t strLen) {
diff --git a/graalpython/com.oracle.graal.python.cext/src/capi.h b/graalpython/com.oracle.graal.python.cext/src/capi.h
@@ -48,6 +48,7 @@
 
 #include "Python.h"
 #include <truffle.h>
+#include <graalvm/llvm/handles.h>
 
 #define SRC_CS "utf-8"
 
@@ -223,7 +224,7 @@ extern free_upcall_fun_t free_upcall;
 // 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__)
+#define resolve_handle_cached(__cache__, __addr__) (__cache__)(__addr__)
 
 void initialize_type_structure(PyTypeObject* structure, PyTypeObject* ptype, polyglot_typeid tid);
 
@@ -232,33 +233,33 @@ void register_native_slots(PyTypeObject* managed_class, PyGetSetDef* getsets, Py
 
 MUST_INLINE
 PyObject* native_to_java(PyObject* obj) {
-    if (!truffle_cannot_be_handle(obj)) {
-        return resolve_handle(cache, (uint64_t)obj);
+    if (points_to_handle_space(obj)) {
+        return resolve_handle_cached(cache, (uint64_t)obj);
     }
     return ptr_cache(obj);
 }
 
 MUST_INLINE
 PyObject* native_to_java_stealing(PyObject* obj) {
-    if (!truffle_cannot_be_handle(obj)) {
-        return resolve_handle(cache, (uint64_t)obj);
+    if (points_to_handle_space(obj)) {
+        return resolve_handle_cached(cache, (uint64_t)obj);
     }
     return ptr_cache_stealing(obj);
 }
 
 
 MUST_INLINE
 PyTypeObject* native_type_to_java(PyTypeObject* type) {
-	if (!truffle_cannot_be_handle(type)) {
-        return (PyTypeObject *)truffle_managed_from_handle(type);
+	if (points_to_handle_space(type)) {
+        return (PyTypeObject *)resolve_handle(type);
     }
     return type_ptr_cache(type, Py_REFCNT(type));
 }
 
 MUST_INLINE
 void* native_pointer_to_java(void* obj) {
-    if (!truffle_cannot_be_handle(obj)) {
-        return resolve_handle(cache, (uint64_t)obj);
+    if (points_to_handle_space(obj)) {
+        return resolve_handle_cached(cache, (uint64_t)obj);
     }
     return obj;
 }
diff --git a/graalpython/com.oracle.graal.python.cext/src/obmalloc.c b/graalpython/com.oracle.graal.python.cext/src/obmalloc.c
@@ -67,7 +67,7 @@ void _PyObject_Free(void* ptr) {
 	if (ptr == NULL) {
 		return;
 	}
-	if((!truffle_cannot_be_handle(ptr) && truffle_is_handle_to_managed(ptr)) || polyglot_is_value(ptr)) {
+	if((points_to_handle_space(ptr) && is_handle(ptr)) || polyglot_is_value(ptr)) {
 		if(free_upcall(native_pointer_to_java(ptr))) {
 		    /* If 1 is returned, the upcall function already took care of freeing */
 		    return;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java
@@ -3013,8 +3013,8 @@ static PythonNativeWrapper resolveObjectCached(@SuppressWarnings("unused") Objec
         static Object resolveGeneric(Object pointerObject,
                         @Cached PCallCapiFunction callTruffleCannotBeHandleNode,
                         @Cached PCallCapiFunction callTruffleManagedFromHandleNode) {
-            if (!((boolean) callTruffleCannotBeHandleNode.call(NativeCAPISymbols.FUN_TRUFFLE_CANNOT_BE_HANDLE, pointerObject))) {
-                return callTruffleManagedFromHandleNode.call(NativeCAPISymbols.FUN_TRUFFLE_MANAGED_FROM_HANDLE, pointerObject);
+            if (((boolean) callTruffleCannotBeHandleNode.call(NativeCAPISymbols.FUN_POINTS_TO_HANDLE_SPACE, pointerObject))) {
+                return callTruffleManagedFromHandleNode.call(NativeCAPISymbols.FUN_RESOLVE_HANDLE, pointerObject);
             }
             // In this case, it cannot be a handle so we can just return the pointer object. It
             // could, of course, still be a native pointer.
@@ -3023,8 +3023,8 @@ static Object resolveGeneric(Object pointerObject,
 
         static PythonNativeWrapper resolveHandleUncached(Object pointerObject) {
             CompilerAsserts.neverPartOfCompilation();
-            if (!((boolean) PCallCapiFunction.getUncached().call(NativeCAPISymbols.FUN_TRUFFLE_CANNOT_BE_HANDLE, pointerObject))) {
-                Object resolved = PCallCapiFunction.getUncached().call(NativeCAPISymbols.FUN_TRUFFLE_MANAGED_FROM_HANDLE, pointerObject);
+            if (((boolean) PCallCapiFunction.getUncached().call(NativeCAPISymbols.FUN_POINTS_TO_HANDLE_SPACE, pointerObject))) {
+                Object resolved = PCallCapiFunction.getUncached().call(NativeCAPISymbols.FUN_RESOLVE_HANDLE, pointerObject);
                 if (resolved instanceof PythonNativeWrapper) {
                     return (PythonNativeWrapper) resolved;
                 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeCAPISymbols.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeCAPISymbols.java
@@ -72,7 +72,7 @@ public abstract class NativeCAPISymbols {
     public static final String FUN_GET_TP_DICTOFFSET = "get_tp_dictoffset";
     public static final String FUN_GET_TP_BASICSIZE = "get_tp_basicsize";
     public static final String FUN_GET_TP_ITEMSIZE = "get_tp_itemsize";
-    public static final String FUN_DEREF_HANDLE = "truffle_deref_handle_for_managed";
+    public static final String FUN_DEREF_HANDLE = "_graalvm_llvm_create_deref_handle";
     public static final String FUN_GET_BYTE_ARRAY_TYPE_ID = "get_byte_array_typeid";
     public static final String FUN_GET_PTR_ARRAY_TYPE_ID = "get_ptr_array_typeid";
     public static final String FUN_PTR_COMPARE = "truffle_ptr_compare";
@@ -100,8 +100,8 @@ public abstract class NativeCAPISymbols {
     public static final String FUN_DECREF = "Py_DecRef";
     public static final String FUN_ADDREF = "PyTruffle_ADDREF";
     public static final String FUN_SUBREF = "PyTruffle_SUBREF";
-    public static final String FUN_TRUFFLE_MANAGED_FROM_HANDLE = "truffle_managed_from_handle";
-    public static final String FUN_TRUFFLE_CANNOT_BE_HANDLE = "truffle_cannot_be_handle";
+    public static final String FUN_RESOLVE_HANDLE = "_graalvm_llvm_resolve_handle";
+    public static final String FUN_POINTS_TO_HANDLE_SPACE = "_graalvm_llvm_points_to_handle_space";
     public static final String FUN_GET_LONG_BITS_PER_DIGIT = "get_long_bits_in_digit";
     public static final String FUN_BULK_SUBREF = "PyTruffle_bulk_SUBREF";
     private static final String FUN_GET_INT8_T_TYPEID = "get_int8_t_typeid";

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ void get_next_vaarg(va_list p_va, OutVarPtr p_outvar) {`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`void* graal_hpy_context_to_native(void* cobj) {`
`351`		`- return truffle_deref_handle_for_managed(cobj);`
	`351`	`+ return create_deref_handle(cobj);`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`#define PRIMITIVE_ARRAY_TO_NATIVE(__jtype__, __ctype__, __polyglot_type__, __element_cast__) \`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ void _PyObject_Free(void* ptr) {`
`67`	`67`	`if (ptr == NULL) {`
`68`	`68`	`return;`
`69`	`69`	`}`
`70`		`- if((!truffle_cannot_be_handle(ptr) && truffle_is_handle_to_managed(ptr)) \|\| polyglot_is_value(ptr)) {`
	`70`	`+ if((points_to_handle_space(ptr) && is_handle(ptr)) \|\| polyglot_is_value(ptr)) {`
`71`	`71`	`if(free_upcall(native_pointer_to_java(ptr))) {`
`72`	`72`	`/* If 1 is returned, the upcall function already took care of freeing */`
`73`	`73`	`return;`