Simplify generic floating point->integer conversions

jkotas · jkotas · commit 99674419872d · 2025-06-21T21:58:27.000-07:00
Floating point to integer conversions for 32-bit and 64-bit integers have predictable truncating behavior on all platforms now. The manual truncation should be unnecessary.

Keep the existing behavior for Mono since Mono has not been fixed to have the predictable truncating behavior.
diff --git a/src/libraries/System.Private.CoreLib/src/System/Double.cs b/src/libraries/System.Private.CoreLib/src/System/Double.cs
@@ -1420,16 +1420,24 @@ private static bool TryConvertTo<TOther>(double value, [MaybeNullWhen(false)] ou
             }
             else if (typeof(TOther) == typeof(uint))
             {
+#if MONO
                 uint actualResult = (value >= uint.MaxValue) ? uint.MaxValue :
                                     (value <= uint.MinValue) ? uint.MinValue : (uint)value;
+#else
+                uint actualResult = (uint)value;
+#endif
                 result = (TOther)(object)actualResult;
                 return true;
             }
             else if (typeof(TOther) == typeof(ulong))
             {
+#if MONO
                 ulong actualResult = (value >= ulong.MaxValue) ? ulong.MaxValue :
                                      (value <= ulong.MinValue) ? ulong.MinValue :
                                      IsNaN(value) ? 0 : (ulong)value;
+#else
+                ulong actualResult = (ulong)value;
+#endif
                 result = (TOther)(object)actualResult;
                 return true;
             }
@@ -1442,6 +1450,7 @@ private static bool TryConvertTo<TOther>(double value, [MaybeNullWhen(false)] ou
             }
             else if (typeof(TOther) == typeof(nuint))
             {
+#if MONO
 #if TARGET_64BIT
                 nuint actualResult = (value >= ulong.MaxValue) ? unchecked((nuint)ulong.MaxValue) :
                                      (value <= ulong.MinValue) ? unchecked((nuint)ulong.MinValue) : (nuint)value;
@@ -1453,6 +1462,11 @@ private static bool TryConvertTo<TOther>(double value, [MaybeNullWhen(false)] ou
                 result = (TOther)(object)actualResult;
                 return true;
 #endif
+#else
+                nuint actualResult = (nuint)value;
+#endif
+                result = (TOther)(object)actualResult;
+                return true;
             }
             else
             {
diff --git a/src/libraries/System.Private.CoreLib/src/System/Int32.cs b/src/libraries/System.Private.CoreLib/src/System/Int32.cs
@@ -1002,8 +1002,12 @@ private static bool TryConvertFromSaturating<TOther>(TOther value, out int resul
             if (typeof(TOther) == typeof(double))
             {
                 double actualValue = (double)(object)value;
+#if MONO
                 result = (actualValue >= MaxValue) ? MaxValue :
                          (actualValue <= MinValue) ? MinValue : (int)actualValue;
+#else
+                result = (int)actualValue;
+#endif
                 return true;
             }
             else if (typeof(TOther) == typeof(Half))
@@ -1049,8 +1053,12 @@ private static bool TryConvertFromSaturating<TOther>(TOther value, out int resul
             else if (typeof(TOther) == typeof(float))
             {
                 float actualValue = (float)(object)value;
+#if MONO
                 result = (actualValue >= MaxValue) ? MaxValue :
                          (actualValue <= MinValue) ? MinValue : (int)actualValue;
+#else
+                result = (int)actualValue;
+#endif
                 return true;
             }
             else
@@ -1080,8 +1088,12 @@ private static bool TryConvertFromTruncating<TOther>(TOther value, out int resul
             if (typeof(TOther) == typeof(double))
             {
                 double actualValue = (double)(object)value;
+#if MONO
                 result = (actualValue >= MaxValue) ? MaxValue :
                          (actualValue <= MinValue) ? MinValue : (int)actualValue;
+#else
+                result = (int)actualValue;
+#endif
                 return true;
             }
             else if (typeof(TOther) == typeof(Half))
@@ -1124,8 +1136,12 @@ private static bool TryConvertFromTruncating<TOther>(TOther value, out int resul
             else if (typeof(TOther) == typeof(float))
             {
                 float actualValue = (float)(object)value;
+#if MONO
                 result = (actualValue >= MaxValue) ? MaxValue :
                          (actualValue <= MinValue) ? MinValue : (int)actualValue;
+#else
+                result = (int)actualValue;
+#endif
                 return true;
             }
             else
diff --git a/src/libraries/System.Private.CoreLib/src/System/Int64.cs b/src/libraries/System.Private.CoreLib/src/System/Int64.cs
@@ -999,8 +999,12 @@ private static bool TryConvertFromSaturating<TOther>(TOther value, out long resu
             if (typeof(TOther) == typeof(double))
             {
                 double actualValue = (double)(object)value;
+#if MONO
                 result = (actualValue >= MaxValue) ? MaxValue :
                          (actualValue <= MinValue) ? MinValue : (long)actualValue;
+#else
+                result = (long)actualValue;
+#endif
                 return true;
             }
             else if (typeof(TOther) == typeof(Half))
@@ -1044,8 +1048,12 @@ private static bool TryConvertFromSaturating<TOther>(TOther value, out long resu
             else if (typeof(TOther) == typeof(float))
             {
                 float actualValue = (float)(object)value;
+#if MONO
                 result = (actualValue >= MaxValue) ? MaxValue :
                          (actualValue <= MinValue) ? MinValue : (long)actualValue;
+#else
+                result = (long)actualValue;
+#endif
                 return true;
             }
             else
@@ -1075,8 +1083,12 @@ private static bool TryConvertFromTruncating<TOther>(TOther value, out long resu
             if (typeof(TOther) == typeof(double))
             {
                 double actualValue = (double)(object)value;
+#if MONO
                 result = (actualValue >= MaxValue) ? MaxValue :
                          (actualValue <= MinValue) ? MinValue : (long)actualValue;
+#else
+                result = (long)actualValue;
+#endif
                 return true;
             }
             else if (typeof(TOther) == typeof(Half))
@@ -1119,8 +1131,12 @@ private static bool TryConvertFromTruncating<TOther>(TOther value, out long resu
             else if (typeof(TOther) == typeof(float))
             {
                 float actualValue = (float)(object)value;
+#if MONO
                 result = (actualValue >= MaxValue) ? MaxValue :
                          (actualValue <= MinValue) ? MinValue : (long)actualValue;
+#else
+                result = (long)actualValue;
+#endif
                 return true;
             }
             else
diff --git a/src/libraries/System.Private.CoreLib/src/System/IntPtr.cs b/src/libraries/System.Private.CoreLib/src/System/IntPtr.cs
@@ -994,8 +994,12 @@ private static bool TryConvertFromSaturating<TOther>(TOther value, out nint resu
             if (typeof(TOther) == typeof(double))
             {
                 double actualValue = (double)(object)value;
+#if MONO
                 result = (actualValue >= nint_t.MaxValue) ? unchecked((nint)nint_t.MaxValue) :
                          (actualValue <= nint_t.MinValue) ? unchecked((nint)nint_t.MinValue) : (nint)actualValue;
+#else
+                result = (nint)actualValue;
+#endif
                 return true;
             }
             else if (typeof(TOther) == typeof(Half))
@@ -1040,8 +1044,12 @@ private static bool TryConvertFromSaturating<TOther>(TOther value, out nint resu
             else if (typeof(TOther) == typeof(float))
             {
                 float actualValue = (float)(object)value;
+#if MONO
                 result = (actualValue >= nint_t.MaxValue) ? unchecked((nint)nint_t.MaxValue) :
                          (actualValue <= nint_t.MinValue) ? unchecked((nint)nint_t.MinValue) : (nint)actualValue;
+#else
+                result = (nint)actualValue;
+#endif
                 return true;
             }
             else
@@ -1071,8 +1079,12 @@ private static bool TryConvertFromTruncating<TOther>(TOther value, out nint resu
             if (typeof(TOther) == typeof(double))
             {
                 double actualValue = (double)(object)value;
+#if MONO
                 result = (actualValue >= nint_t.MaxValue) ? unchecked((nint)nint_t.MaxValue) :
                          (actualValue <= nint_t.MinValue) ? unchecked((nint)nint_t.MinValue) : (nint)actualValue;
+#else
+                result = (nint)actualValue;
+#endif
                 return true;
             }
             else if (typeof(TOther) == typeof(Half))
@@ -1115,8 +1127,12 @@ private static bool TryConvertFromTruncating<TOther>(TOther value, out nint resu
             else if (typeof(TOther) == typeof(float))
             {
                 float actualValue = (float)(object)value;
+#if MONO
                 result = (actualValue >= nint_t.MaxValue) ? unchecked((nint)nint_t.MaxValue) :
                          (actualValue <= nint_t.MinValue) ? unchecked((nint)nint_t.MinValue) : (nint)actualValue;
+#else
+                result = (nint)actualValue;
+#endif
                 return true;
             }
             else
diff --git a/src/libraries/System.Private.CoreLib/src/System/Single.cs b/src/libraries/System.Private.CoreLib/src/System/Single.cs
@@ -1439,16 +1439,24 @@ private static bool TryConvertTo<TOther>(float value, [MaybeNullWhen(false)] out
             }
             else if (typeof(TOther) == typeof(uint))
             {
+#if MONO
                 uint actualResult = (value >= uint.MaxValue) ? uint.MaxValue :
                                     (value <= uint.MinValue) ? uint.MinValue : (uint)value;
+#else
+                uint actualResult = (uint)value;
+#endif
                 result = (TOther)(object)actualResult;
                 return true;
             }
             else if (typeof(TOther) == typeof(ulong))
             {
+#if MONO
                 ulong actualResult = (value >= ulong.MaxValue) ? ulong.MaxValue :
                                      (value <= ulong.MinValue) ? ulong.MinValue :
                                      IsNaN(value) ? 0 : (ulong)value;
+#else
+                ulong actualResult = (ulong)value;
+#endif
                 result = (TOther)(object)actualResult;
                 return true;
             }
@@ -1461,6 +1469,7 @@ private static bool TryConvertTo<TOther>(float value, [MaybeNullWhen(false)] out
             }
             else if (typeof(TOther) == typeof(nuint))
             {
+#if MONO
 #if TARGET_64BIT
                 nuint actualResult = (value >= ulong.MaxValue) ? unchecked((nuint)ulong.MaxValue) :
                                      (value <= ulong.MinValue) ? unchecked((nuint)ulong.MinValue) : (nuint)value;
@@ -1472,6 +1481,11 @@ private static bool TryConvertTo<TOther>(float value, [MaybeNullWhen(false)] out
                 result = (TOther)(object)actualResult;
                 return true;
 #endif
+#else
+                nuint actualResult = (nuint)value;
+#endif
+                result = (TOther)(object)actualResult;
+                return true;
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -1420,16 +1420,24 @@ private static bool TryConvertTo<TOther>(double value, [MaybeNullWhen(false)] ou`
`1420`	`1420`	`}`
`1421`	`1421`	`else if (typeof(TOther) == typeof(uint))`
`1422`	`1422`	`{`
	`1423`	`+#if MONO`
`1423`	`1424`	`uint actualResult = (value >= uint.MaxValue) ? uint.MaxValue :`
`1424`	`1425`	`(value <= uint.MinValue) ? uint.MinValue : (uint)value;`
	`1426`	`+#else`
	`1427`	`+ uint actualResult = (uint)value;`
	`1428`	`+#endif`
`1425`	`1429`	`result = (TOther)(object)actualResult;`
`1426`	`1430`	`return true;`
`1427`	`1431`	`}`
`1428`	`1432`	`else if (typeof(TOther) == typeof(ulong))`
`1429`	`1433`	`{`
	`1434`	`+#if MONO`
`1430`	`1435`	`ulong actualResult = (value >= ulong.MaxValue) ? ulong.MaxValue :`
`1431`	`1436`	`(value <= ulong.MinValue) ? ulong.MinValue :`
`1432`	`1437`	`IsNaN(value) ? 0 : (ulong)value;`
	`1438`	`+#else`
	`1439`	`+ ulong actualResult = (ulong)value;`
	`1440`	`+#endif`
`1433`	`1441`	`result = (TOther)(object)actualResult;`
`1434`	`1442`	`return true;`
`1435`	`1443`	`}`
`@@ -1442,6 +1450,7 @@ private static bool TryConvertTo<TOther>(double value, [MaybeNullWhen(false)] ou`
`1442`	`1450`	`}`
`1443`	`1451`	`else if (typeof(TOther) == typeof(nuint))`
`1444`	`1452`	`{`
	`1453`	`+#if MONO`
`1445`	`1454`	`#if TARGET_64BIT`
`1446`	`1455`	`nuint actualResult = (value >= ulong.MaxValue) ? unchecked((nuint)ulong.MaxValue) :`
`1447`	`1456`	`(value <= ulong.MinValue) ? unchecked((nuint)ulong.MinValue) : (nuint)value;`
`@@ -1453,6 +1462,11 @@ private static bool TryConvertTo<TOther>(double value, [MaybeNullWhen(false)] ou`
`1453`	`1462`	`result = (TOther)(object)actualResult;`
`1454`	`1463`	`return true;`
`1455`	`1464`	`#endif`
	`1465`	`+#else`
	`1466`	`+ nuint actualResult = (nuint)value;`
	`1467`	`+#endif`
	`1468`	`+ result = (TOther)(object)actualResult;`
	`1469`	`+ return true;`
`1456`	`1470`	`}`
`1457`	`1471`	`else`
`1458`	`1472`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1439,16 +1439,24 @@ private static bool TryConvertTo<TOther>(float value, [MaybeNullWhen(false)] out`
`1439`	`1439`	`}`
`1440`	`1440`	`else if (typeof(TOther) == typeof(uint))`
`1441`	`1441`	`{`
	`1442`	`+#if MONO`
`1442`	`1443`	`uint actualResult = (value >= uint.MaxValue) ? uint.MaxValue :`
`1443`	`1444`	`(value <= uint.MinValue) ? uint.MinValue : (uint)value;`
	`1445`	`+#else`
	`1446`	`+ uint actualResult = (uint)value;`
	`1447`	`+#endif`
`1444`	`1448`	`result = (TOther)(object)actualResult;`
`1445`	`1449`	`return true;`
`1446`	`1450`	`}`
`1447`	`1451`	`else if (typeof(TOther) == typeof(ulong))`
`1448`	`1452`	`{`
	`1453`	`+#if MONO`
`1449`	`1454`	`ulong actualResult = (value >= ulong.MaxValue) ? ulong.MaxValue :`
`1450`	`1455`	`(value <= ulong.MinValue) ? ulong.MinValue :`
`1451`	`1456`	`IsNaN(value) ? 0 : (ulong)value;`
	`1457`	`+#else`
	`1458`	`+ ulong actualResult = (ulong)value;`
	`1459`	`+#endif`
`1452`	`1460`	`result = (TOther)(object)actualResult;`
`1453`	`1461`	`return true;`
`1454`	`1462`	`}`
`@@ -1461,6 +1469,7 @@ private static bool TryConvertTo<TOther>(float value, [MaybeNullWhen(false)] out`
`1461`	`1469`	`}`
`1462`	`1470`	`else if (typeof(TOther) == typeof(nuint))`
`1463`	`1471`	`{`
	`1472`	`+#if MONO`
`1464`	`1473`	`#if TARGET_64BIT`
`1465`	`1474`	`nuint actualResult = (value >= ulong.MaxValue) ? unchecked((nuint)ulong.MaxValue) :`
`1466`	`1475`	`(value <= ulong.MinValue) ? unchecked((nuint)ulong.MinValue) : (nuint)value;`
`@@ -1472,6 +1481,11 @@ private static bool TryConvertTo<TOther>(float value, [MaybeNullWhen(false)] out`
`1472`	`1481`	`result = (TOther)(object)actualResult;`
`1473`	`1482`	`return true;`
`1474`	`1483`	`#endif`
	`1484`	`+#else`
	`1485`	`+ nuint actualResult = (nuint)value;`
	`1486`	`+#endif`
	`1487`	`+ result = (TOther)(object)actualResult;`
	`1488`	`+ return true;`
`1475`	`1489`	`}`
`1476`	`1490`	`else`
`1477`	`1491`	`{`