Remove remaining 'truffle_invoke' usages.

Author: fangerer

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

@@ -107,11 +107,11 @@
 #include "pyfpe.h"
 #include "memoryobject.h"
 
-#undef Py_NoValue
-#define Py_NoValue truffle_invoke(PY_TRUFFLE_CEXT, "Py_NoValue")
+#define PY_TRUFFLE_CEXT ((void*)polyglot_import("python_cext"))
+#define PY_BUILTIN ((void*)polyglot_import("python_builtins"))
 
-#define PY_TRUFFLE_CEXT ((void*)truffle_import_cached("python_cext"))
-#define PY_BUILTIN ((void*)truffle_import_cached("python_builtins"))
+#undef Py_NoValue
+#define Py_NoValue UPCALL_CEXT_O("Py_NoValue")
 
 // TODO: we must extend the refcounting behavior to support handles to managed objects
 #undef Py_DECREF

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

@@ -200,7 +200,7 @@ inline PyObject* explicit_cast(PyObject* cobj) {
 }
 
 PyObject* to_sulong(void *o) {
-    return explicit_cast(truffle_invoke(PY_TRUFFLE_CEXT, "to_sulong", o));
+    return explicit_cast(polyglot_invoke(PY_TRUFFLE_CEXT, "to_sulong", o));
 }
 
 /** to be used from Java code only; reads native 'ob_type' field */
@@ -414,7 +414,7 @@ PyObject* WriteULongMember(PyObject* object, PyObject* offset, PyObject* value)
 }
 
 PyObject* WriteBoolMember(PyObject* object, PyObject* offset, PyObject* value) {
-    WriteMember(object, offset, truffle_invoke(to_java(value), "__bool__") == Py_True ? (char)1 : (char)0, char);
+    WriteMember(object, offset, UPCALL_O(native_to_java(value), "__bool__") == Py_True ? (char)1 : (char)0, char);
     return value;
 }
 
@@ -451,7 +451,7 @@ PyObject marker_struct = {
 #undef WriteMember
 
 int PyTruffle_Debug(void *arg) {
-	truffle_invoke(PY_TRUFFLE_CEXT, "PyTruffle_Debug", arg);
+	polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_Debug", arg);
 	return 0;
 }
 

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

@@ -39,7 +39,7 @@
 #include "capi.h"
 
 Py_hash_t _Py_HashDouble(double value) {
-    return truffle_invoke_l(PY_BUILTIN, "hash", value);
+    return UPCALL_L(PY_BUILTIN, "hash", value);
 }
 
 long _PyHASH_INF;