Add helpers to check if double or long fits in float or int

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/transitions/CApiTransitions.java

@@ -91,6 +91,7 @@
 import com.oracle.graal.python.builtins.objects.cext.structs.CStructs;
 import com.oracle.graal.python.builtins.objects.floats.PFloat;
 import com.oracle.graal.python.builtins.objects.getsetdescriptor.DescriptorDeleteMarker;
+import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.memoryview.PMemoryView;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
@@ -920,15 +921,12 @@ public static long stubToPointer(long stubPointer) {
             return stubPointer | HANDLE_TAG_BIT;
         }
 
-        public static long intToPointer(long value) {
-            assert value == (int) value;
-            return (value << 3) & _35BIT_MASK | HANDLE_TAG_BIT | INTEGER_TAG_BIT;
+        public static long intToPointer(int value) {
+            return ((long) value << 3) & _35BIT_MASK | HANDLE_TAG_BIT | INTEGER_TAG_BIT;
         }
 
-        public static long floatToPointer(double value) {
-            float f = (float) value;
-            assert !Double.isFinite(value) || f == value;
-            long rawFloatBits = Float.floatToRawIntBits(f);
+        public static long floatToPointer(float value) {
+            long rawFloatBits = Float.floatToRawIntBits(value);
             return (rawFloatBits << 3) & _35BIT_MASK | HANDLE_TAG_BIT | FLOAT_TAG_BIT;
         }
 
@@ -977,15 +975,15 @@ static long doPrimitiveNativeWrapper(Node inliningTarget, PrimitiveNativeWrapper
             } else if (wrapper.isInt()) {
                 return HandlePointerConverter.intToPointer(wrapper.getInt());
             } else if (wrapper.isLong()) {
-                if ((int) wrapper.getLong() == wrapper.getLong()) {
-                    return HandlePointerConverter.intToPointer((int) wrapper.getLong());
+                long value = wrapper.getLong();
+                if (PInt.fitsInInt(value)) {
+                    return HandlePointerConverter.intToPointer((int) value);
                 }
                 type = PythonBuiltinClassType.PInt;
             } else if (isFloat) {
                 double d = wrapper.getDouble();
-                float f = (float) d;
-                if (!Double.isFinite(d) || f == d) {
-                    return HandlePointerConverter.floatToPointer(wrapper.getDouble());
+                if (PFloat.fitsInFloat(d)) {
+                    return HandlePointerConverter.floatToPointer((float) d);
                 }
                 type = PythonBuiltinClassType.PFloat;
             } else {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/transitions/GetNativeWrapperNode.java

@@ -51,6 +51,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativeWrapper.PythonAbstractObjectNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.HandlePointerConverter;
+import com.oracle.graal.python.builtins.objects.floats.PFloat;
 import com.oracle.graal.python.builtins.objects.cext.capi.PythonObjectNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.capi.TruffleObjectNativeWrapper;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
@@ -110,23 +111,22 @@ static PythonAbstractObjectNativeWrapper doBoolean(boolean b,
     }
 
     @Specialization
-    static Object doInt(int l) {
-        return HandlePointerConverter.intToPointer(l);
+    static Object doInt(int i) {
+        return HandlePointerConverter.intToPointer(i);
     }
 
     @Specialization
     static Object doLong(long l) {
-        if (l == (int) l) {
-            return HandlePointerConverter.intToPointer(l);
+        if (PInt.fitsInInt(l)) {
+            return HandlePointerConverter.intToPointer((int) l);
         }
         return PrimitiveNativeWrapper.createLong(l);
     }
 
     @Specialization
     static Object doDouble(double d) {
-        float f = (float) d;
-        if (!Double.isFinite(d) || f == d) {
-            return HandlePointerConverter.floatToPointer(d);
+        if (PFloat.fitsInFloat(d)) {
+            return HandlePointerConverter.floatToPointer((float) d);
         }
         return PrimitiveNativeWrapper.createDouble(d);
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/PFloat.java

@@ -162,4 +162,10 @@ boolean fitsInLong(@CachedLibrary("this.value") InteropLibrary interop) {
     long asLong(@CachedLibrary("this.value") InteropLibrary interop) throws UnsupportedMessageException {
         return interop.asLong(value);
     }
+
+    @Ignore
+    public static boolean fitsInFloat(double d) {
+        float f = (float) d;
+        return !Double.isFinite(d) || f == d;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/PInt.java

@@ -703,4 +703,10 @@ public static Object createPythonIntFromUnsignedLong(Node inliningTarget, Python
     private static BigInteger longToUnsignedBigInt(long l) {
         return BigInteger.valueOf(l >>> 32).shiftLeft(32).add(BigInteger.valueOf(l & 0xFFFFFFFFL));
     }
+
+    @Ignore
+    public static boolean fitsInInt(long l) {
+        int i = (int) l;
+        return l == i;
+    }
 }