HPy: fix over/underflow in native fast-paths for HPyLong_FromXYZ

Author: steve-s

graalpython/com.oracle.graal.python.jni/src/hpy_jni.c

@@ -296,36 +296,32 @@ static double augment_Long_AsDouble(HPyContext *ctx, HPy h) {
 }
 
 static HPy augment_Long_FromLong(HPyContext *ctx, long l) {
-    int32_t i = (int32_t) l;
-    if (l == i) {
-        return toPtr(boxInt(i));
+    if (isBoxableInt(l)) {
+        return toPtr(boxInt((int32_t) l));
     } else {
         return original_Long_FromLong(ctx, l);
     }
 }
 
 static HPy augment_Long_FromUnsignedLong(HPyContext *ctx, unsigned long l) {
-    int32_t i = (int32_t) l;
-    if (l == i) {
-        return toPtr(boxInt(i));
+    if (isBoxableUnsignedInt(l)) {
+        return toPtr(boxInt((int32_t) l));
     } else {
         return original_Long_FromUnsignedLong(ctx, l);
     }
 }
 
 static HPy augment_Long_FromLongLong(HPyContext *ctx, long long l) {
-    int32_t i = (int32_t) l;
-    if (l == i) {
-        return toPtr(boxInt(i));
+    if (isBoxableInt(l)) {
+        return toPtr(boxInt((int32_t) l));
     } else {
         return original_Long_FromLongLong(ctx, l);
     }
 }
 
 static HPy augment_Long_FromUnsignedLongLong(HPyContext *ctx, unsigned long long l) {
-    int32_t i = (int32_t) l;
-    if (l == i) {
-        return toPtr(boxInt(i));
+    if (isBoxableUnsignedInt(l)) {
+        return toPtr(boxInt((int32_t) l));
     } else {
         return original_Long_FromUnsignedLongLong(ctx, l);
     }

graalpython/com.oracle.graal.python.jni/src/hpy_jni.h

@@ -47,6 +47,7 @@
 
 #include <hpy.h>
 #include <jni.h>
+#include <stdint.h>
 
 //*************************
 // BOXING
@@ -65,6 +66,8 @@
 #define unboxHandle(value) (value)
 #define boxHandle(handle) (handle)
 
+#define isBoxableInt(value) (INT32_MIN < (value) && (value) < INT32_MAX)
+#define isBoxableUnsignedInt(value) ((value) < INT32_MAX)
 #define unboxInt(value) ((int32_t) ((value) - NAN_BOXING_INT))
 #define boxInt(value) ((((uint64_t) (value)) & NAN_BOXING_INT_MASK) + NAN_BOXING_INT)