Create separate upcall function for 'PyLong_FromDouble'.

Author: fangerer

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

@@ -85,9 +85,9 @@ PyObject * PyLong_FromSsize_t(Py_ssize_t n) {
 	return PyLong_FromLongLong(n);
 }
 
-UPCALL_ID(PyLong_FromLongLong);
+UPCALL_ID(PyLong_FromDouble);
 PyObject * PyLong_FromDouble(double n) {
-    return UPCALL_CEXT_O(_jls_PyLong_FromLongLong, n, 1);
+    return UPCALL_CEXT_O(_jls_PyLong_FromDouble, n);
 }
 
 UPCALL_ID(ssize_t);
@@ -112,6 +112,7 @@ void * PyLong_AsVoidPtr(PyObject *obj){
     return (void *)UPCALL_CEXT_L(_jls_PyLong_AsVoidPtr, native_to_java(obj));
 }
 
+UPCALL_ID(PyLong_FromLongLong);
 PyObject * PyLong_FromLong(long n)  {
     return UPCALL_CEXT_O(_jls_PyLong_FromLongLong, n, 1);
 }

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

@@ -87,6 +87,7 @@
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonObjectNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeNull;
+import com.oracle.graal.python.builtins.objects.cext.PythonNativeObject;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeVoidPtr;
 import com.oracle.graal.python.builtins.objects.cext.UnicodeObjectNodes.UnicodeAsWideCharNode;
 import com.oracle.graal.python.builtins.objects.code.PCode;
@@ -1916,9 +1917,9 @@ private static BigInteger convertToBigInteger(long n) {
         }
 
         @Specialization
-        Object doPointer(TruffleObject n, @SuppressWarnings("unused") int signed,
+        Object doPointer(PythonNativeObject n, @SuppressWarnings("unused") int signed,
                         @Cached("create()") CExtNodes.ToSulongNode toSulongNode) {
-            return toSulongNode.execute(n);
+            return toSulongNode.execute(factory().createNativeVoidPtr((TruffleObject) n.object));
         }
     }
 

graalpython/lib-graalpython/python_cext.py

@@ -331,6 +331,11 @@ def _PyLong_Sign(n):
         return 1
 
 
+@may_raise
+def PyLong_FromDouble(d):
+    return int(d)
+
+
 @may_raise
 def PyLong_FromString(string, base, negative):
     result = int(string, base)