Add Python landing function for primitive double return value.

Author: fangerer

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

@@ -98,7 +98,7 @@ void* handle_exception(void* val);
 #define PY_TRUFFLE_LANDING ((PyObject*(*)(void *rcv, void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Upcall", SRC_CS)))
 #define PY_TRUFFLE_CEXT_LANDING ((PyObject*(*)(void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Cext_Upcall", SRC_CS)))
 #define PY_TRUFFLE_CEXT_LANDING_L ((uint64_t (*)(void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Cext_Upcall_l", SRC_CS)))
-#define PY_TRUFFLE_CEXT_LANDING_D ((double (*)(void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Cext_Upcall_l", SRC_CS)))
+#define PY_TRUFFLE_CEXT_LANDING_D ((double (*)(void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Cext_Upcall_d", SRC_CS)))
 #define UPCALL_O(__recv__, __name__, ...) handle_exception_and_cast(PY_TRUFFLE_LANDING((__recv__), polyglot_from_string((__name__), SRC_CS), __VA_ARGS__))
 #define UPCALL_CEXT_O(__name__, ...) handle_exception_and_cast(PY_TRUFFLE_CEXT_LANDING(polyglot_from_string((__name__), SRC_CS), ##__VA_ARGS__))
 #define UPCALL_CEXT_VOID(__name__, ...) (PY_TRUFFLE_CEXT_LANDING(polyglot_from_string((__name__), SRC_CS), ##__VA_ARGS__))

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

@@ -214,9 +214,9 @@ long run(double value) {
         }
 
         @Specialization
-        @TruffleBoundary
         long run(PInt value) {
-            return value.getValue().longValue();
+            // TODO(fa) longValueExact ?
+            return value.longValue();
         }
 
         @Specialization
@@ -227,9 +227,16 @@ long run(PFloat value) {
         @Specialization
         Object run(PythonNativeWrapper value,
                         @Cached("create()") AsLong recursive) {
+            // TODO(fa) this specialization should eventually go away
             return recursive.executeWith(value.getDelegate());
         }
 
+        @Fallback
+        Object runGeneric(Object value) {
+            // TODO(fa) force primitive
+            return getIntNode().executeWith(getCore().lookupType(Integer.class), value, PNone.NONE);
+        }
+
         private BuiltinConstructors.IntNode getIntNode() {
             if (intNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -238,11 +245,6 @@ private BuiltinConstructors.IntNode getIntNode() {
             return intNode;
         }
 
-        @Fallback
-        Object runGeneric(Object value) {
-            return getIntNode().executeWith(getCore().lookupType(Integer.class), value, PNone.NONE);
-        }
-
         static AsLong create() {
             return TruffleCextBuiltinsFactory.AsLongFactory.create(null);
         }
@@ -274,9 +276,8 @@ abstract static class AsDouble extends PythonBuiltinNode {
         }
 
         @Specialization
-        @TruffleBoundary
         double run(PInt value) {
-            return value.getValue().doubleValue();
+            return value.doubleValue();
         }
 
         @Specialization

graalpython/lib-graalpython/python_cext.py

@@ -1178,4 +1178,12 @@ def PyTruffle_Cext_Upcall_l(name, *args):
     converted = [None] * nargs
     for i in range(nargs):
         converted[i] = to_java(args[i])
-    return globals()[name](*converted)
+    return to_long(globals()[name](*converted))
+
+
+def PyTruffle_Cext_Upcall_d(name, *args):
+    nargs = len(args)
+    converted = [None] * nargs
+    for i in range(nargs):
+        converted[i] = to_java(args[i])
+    return to_double(globals()[name](*converted))