Skip to content

Commit 1c3221b

Browse files
authored
Remove some unnecessary #if TARGET_64BIT (#118361)
1 parent 0b1f401 commit 1c3221b

File tree

4 files changed

+6
-25
lines changed

4 files changed

+6
-25
lines changed

src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/CompilerServices/FunctionPointerOps.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,7 @@ public static unsafe IntPtr GetGenericMethodFunctionPointer(IntPtr canonFunction
8888
public static unsafe bool IsGenericMethodPointer(IntPtr functionPointer)
8989
{
9090
// Check the low bit to find out what kind of function pointer we have here.
91-
#if TARGET_64BIT
92-
if ((functionPointer.ToInt64() & FatFunctionPointerOffset) == FatFunctionPointerOffset)
93-
#else
94-
if ((functionPointer.ToInt32() & FatFunctionPointerOffset) == FatFunctionPointerOffset)
95-
#endif
91+
if ((functionPointer & FatFunctionPointerOffset) == FatFunctionPointerOffset)
9692
{
9793
return true;
9894
}

src/libraries/System.Private.CoreLib/src/System/Double.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,13 +1450,8 @@ private static bool TryConvertTo<TOther>(double value, [MaybeNullWhen(false)] ou
14501450
else if (typeof(TOther) == typeof(nuint))
14511451
{
14521452
#if MONO
1453-
#if TARGET_64BIT
1454-
nuint actualResult = (value >= ulong.MaxValue) ? unchecked((nuint)ulong.MaxValue) :
1455-
(value <= ulong.MinValue) ? unchecked((nuint)ulong.MinValue) : (nuint)value;
1456-
#else
1457-
nuint actualResult = (value >= uint.MaxValue) ? uint.MaxValue :
1458-
(value <= uint.MinValue) ? uint.MinValue : (nuint)value;
1459-
#endif
1453+
nuint actualResult = (value >= nuint.MaxValue) ? nuint.MaxValue :
1454+
(value <= nuint.MinValue) ? nuint.MinValue : (nuint)value;
14601455
#else
14611456
nuint actualResult = (nuint)value;
14621457
#endif

src/libraries/System.Private.CoreLib/src/System/Single.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1469,13 +1469,8 @@ private static bool TryConvertTo<TOther>(float value, [MaybeNullWhen(false)] out
14691469
else if (typeof(TOther) == typeof(nuint))
14701470
{
14711471
#if MONO
1472-
#if TARGET_64BIT
1473-
nuint actualResult = (value >= ulong.MaxValue) ? unchecked((nuint)ulong.MaxValue) :
1474-
(value <= ulong.MinValue) ? unchecked((nuint)ulong.MinValue) : (nuint)value;
1475-
#else
1476-
nuint actualResult = (value >= uint.MaxValue) ? uint.MaxValue :
1477-
(value <= uint.MinValue) ? uint.MinValue : (nuint)value;
1478-
#endif
1472+
nuint actualResult = (value >= nuint.MaxValue) ? nuint.MaxValue :
1473+
(value <= nuint.MinValue) ? nuint.MinValue : (nuint)value;
14791474
#else
14801475
nuint actualResult = (nuint)value;
14811476
#endif

src/libraries/System.Private.CoreLib/src/System/UIntPtr.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -486,13 +486,8 @@ bool IBinaryInteger<nuint>.TryWriteLittleEndian(Span<byte> destination, out int
486486
/// <inheritdoc cref="IBinaryNumber{TSelf}.AllBitsSet" />
487487
static nuint IBinaryNumber<nuint>.AllBitsSet
488488
{
489-
#if TARGET_64BIT
490-
[NonVersionable]
491-
get => unchecked((nuint)0xFFFF_FFFF_FFFF_FFFF);
492-
#else
493489
[NonVersionable]
494-
get => (nuint)0xFFFF_FFFF;
495-
#endif
490+
get => unchecked((nuint)nuint_t.MaxValue);
496491
}
497492

498493
/// <inheritdoc cref="IBinaryNumber{TSelf}.IsPow2(TSelf)" />

0 commit comments

Comments
 (0)