Cleanup after rebasing.

Author: fangerer

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

@@ -129,7 +129,7 @@ PyObject * PyNumber_Index(PyObject *o) {
     if (o == NULL) {
         return null_error();
     }
-    return UPCALL_CEXT_O("PyNumber_Index", to_java(o));
+    return UPCALL_CEXT_O("PyNumber_Index", native_to_java(o));
 }
 
 Py_ssize_t PyNumber_AsSsize_t(PyObject *item, PyObject *err) {
@@ -183,19 +183,11 @@ PyObject * PyNumber_Float(PyObject *o) {
 }
 
 PyObject * PyNumber_Absolute(PyObject *o) {
-    void *result = polyglot_invoke(PY_TRUFFLE_CEXT, "PyNumber_Absolute", to_java(o));
-    if (result == ERROR_MARKER) {
-    	return NULL;
-    }
-    return to_sulong(result);
+    return UPCALL_CEXT_O("PyNumber_Absolute", native_to_java(o));
 }
 
 PyObject * PyNumber_Divmod(PyObject *a, PyObject *b) {
-    void *result = polyglot_invoke(PY_TRUFFLE_CEXT, "PyNumber_Divmod", to_java(a), to_java(b));
-    if (result == ERROR_MARKER) {
-    	return NULL;
-    }
-    return to_sulong(result);
+    return UPCALL_CEXT_O("PyNumber_Divmod", native_to_java(a), native_to_java(b));
 }
 
 
@@ -207,11 +199,11 @@ int PySequence_Check(PyObject *s) {
 	if (s == NULL) {
 		return 0;
 	}
-	return polyglot_as_i64(polyglot_invoke(PY_TRUFFLE_CEXT, "PySequence_Check", to_java(s)));
+	return UPCALL_CEXT_I("PySequence_Check", native_to_java(s));
 }
 
 Py_ssize_t PySequence_Size(PyObject *s) {
-	return polyglot_as_i64(polyglot_invoke(PY_TRUFFLE_CEXT, "PyObject_Size", to_java(s)));
+    return UPCALL_CEXT_L("PyObject_Size", native_to_java(s));
 }
 
 // taken from CPython "Objects/abstract.c"

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

@@ -240,8 +240,22 @@ void* NativeHandle_ForArray(void* jobj, ssize_t element_size) {
     return truffle_deref_handle_for_managed(jobj);
 }
 
-const char* PyTruffle_StringToCstr(void* o) {
-    return polyglot_from_string(o, SRC_CS);
+const char* PyTruffle_StringToCstr(void* o, int32_t strLen) {
+    const char *buffer;
+    const char *str;
+    uint64_t bufsize = 4 * (strLen + 1) * sizeof(char);
+    uint64_t written;
+
+    // we allocate 4 bytes for a char; this will in all cases be enough
+    buffer = (const char*) malloc(bufsize);
+
+    written = polyglot_as_string(o, buffer, bufsize, SRC_CS) + 1;
+
+    str = (const char*) malloc(written * sizeof(char));
+    memcpy(str, buffer, written * sizeof(char));
+    free(buffer);
+
+    return str;
 }
 
 const char* PyTruffle_ByteArrayToNative(const void* jbyteArray, int len) {

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

@@ -120,7 +120,7 @@ extern void* to_java_type(PyTypeObject* cls);
 void* native_to_java(PyObject* obj);
 extern PyObject* to_sulong(void *o);
 extern PyObject* explicit_cast(PyObject* cobj);
-#define as_char_pointer(obj) UPCALL_CEXT_O("to_char_pointer", native_to_java(obj))
+#define as_char_pointer(obj) ((const char*)UPCALL_CEXT_PTR("to_char_pointer", native_to_java(obj)))
 #define as_long(obj) ((long)polyglot_as_i64(polyglot_invoke(PY_TRUFFLE_CEXT, "to_long", to_java(obj))))
 #define as_long_long(obj) ((long long)polyglot_as_i64(polyglot_invoke(PY_TRUFFLE_CEXT, "PyLong_AsPrimitive", to_java(obj), 1, sizeof(long long), polyglot_from_string("long long", "utf-8"))))
 #define as_unsigned_long_long(obj) ((unsigned long long)polyglot_as_i64(polyglot_invoke(PY_TRUFFLE_CEXT, "PyLong_AsPrimitive", to_java(obj), 0, sizeof(unsigned long long), polyglot_from_string("unsigned long long", "utf-8"))))

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

@@ -39,7 +39,7 @@
 #include "capi.h"
 
 PyObject* PyImport_ImportModule(const char *name) {
-    return polyglot_as_PyModuleObject(UPCALL_CEXT_O("PyImport_ImportModule", polyglot_from_string(name, SRC_CS)));
+    return UPCALL_CEXT_O("PyImport_ImportModule", polyglot_from_string(name, SRC_CS));
 }
 
 PyObject* PyImport_GetModuleDict() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java

@@ -148,16 +148,15 @@ Object run(Object object,
     @GenerateNodeFactory
     abstract static class TruffleString_AsString extends NativeBuiltin {
 
-        @Specialization
-        Object run(PythonObjectNativeWrapper str,
-                        @Cached("create()") CExtNodes.AsCharPointer asCharPointerNode,
-                        @Cached("create()") CExtNodes.ToJavaNode toJavaNode) {
-            return asCharPointerNode.execute(toJavaNode.execute(str));
+        @Specialization(guards = "isString(str)")
+        Object run(Object str,
+                        @Cached("create()") CExtNodes.AsCharPointer asCharPointerNode) {
+            return asCharPointerNode.execute(str);
         }
 
         @Fallback
         Object run(Object o) {
-            return raiseNative(PNone.NO_VALUE, PythonErrorType.SystemError, "Cannot convert object of type %p to C string.", o);
+            return raiseNative(PNone.NO_VALUE, PythonErrorType.SystemError, "Cannot convert object of type %p to C string.", o, o.getClass().getName());
         }
     }