fix 64-bit bounds for convertion from double

ocaml · Mar 28, 2023 · 2bb4cdb · 2bb4cdb
1 parent 6ce46a5
commit 2bb4cdb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/caml_z.c b/caml_z.c
@@ -160,12 +160,10 @@ extern "C" {
 #endif
 #define Z_FITS_INT(v)  ((v) >= Z_MIN_INT && (v) <= Z_MAX_INT)
 
-/* Z_MAX_INT may not be representable exactly as a double => we use a
-   lower approximation to be safe
- */
+/* greatest/smallest double that can fit in an int */
 #ifdef ARCH_SIXTYFOUR
-#define Z_MAX_INT_FL    0x3ffffffffffff000
-#define Z_MIN_INT_FL    (-Z_MAX_INT_FL)
+#define Z_MAX_INT_FL    0x3ffffffffffffe00
+#define Z_MIN_INT_FL    (-0x4000000000000000)
 #else
 #define Z_MAX_INT_FL    Z_MAX_INT
 #define Z_MIN_INT_FL    Z_MIN_INT

diff --git a/caml_z_tommath.c b/caml_z_tommath.c
@@ -86,12 +86,10 @@ static mp_int z_max_intnat, z_min_intnat;
 static mp_int z_max_int32,  z_min_int32;
 static mp_int z_max_int64,  z_min_int64;
 
-/* Z_MAX_INT may not be representable exactly as a double => we use a
-   lower approximation to be safe
- */
+/* greatest/smallest double that can fit in an int */
 #ifdef ARCH_SIXTYFOUR
-#define Z_MAX_INT_FL    0x3ffffffffffff000
-#define Z_MIN_INT_FL    (-Z_MAX_INT_FL)
+#define Z_MAX_INT_FL    0x3ffffffffffffe00
+#define Z_MIN_INT_FL    (-0x4000000000000000)
 #else
 #define Z_MAX_INT_FL    Z_MAX_INT
 #define Z_MIN_INT_FL    Z_MIN_INT