Skip to content

Remove some unnecessary #if TARGET_64BIT #118361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 30, 2025
+6 −25
Merged

Remove some unnecessary #if TARGET_64BIT #118361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c75a5a
Remove some unnecessary `#if TARGET_64BIT`
xtqqczze Aug 3, 2025
b3b4174
fix typo
xtqqczze Aug 5, 2025
249a2f2
change `Double`
xtqqczze Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions ...iveaot/System.Private.CoreLib/src/Internal/Runtime/CompilerServices/FunctionPointerOps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,7 @@ public static unsafe IntPtr GetGenericMethodFunctionPointer(IntPtr canonFunction
public static unsafe bool IsGenericMethodPointer(IntPtr functionPointer)
{
// Check the low bit to find out what kind of function pointer we have here.
#if TARGET_64BIT
if ((functionPointer.ToInt64() & FatFunctionPointerOffset) == FatFunctionPointerOffset)
#else
if ((functionPointer.ToInt32() & FatFunctionPointerOffset) == FatFunctionPointerOffset)
#endif
if ((functionPointer & FatFunctionPointerOffset) == FatFunctionPointerOffset)
{
return true;
}
Expand Down
9 changes: 2 additions & 7 deletions src/libraries/System.Private.CoreLib/src/System/Double.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1450,13 +1450,8 @@ 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;
#else
nuint actualResult = (value >= uint.MaxValue) ? uint.MaxValue :
(value <= uint.MinValue) ? uint.MinValue : (nuint)value;
#endif
nuint actualResult = (value >= nuint.MaxValue) ? nuint.MaxValue :
(value <= nuint.MinValue) ? nuint.MinValue : (nuint)value;
#else
nuint actualResult = (nuint)value;
#endif
Expand Down
9 changes: 2 additions & 7 deletions src/libraries/System.Private.CoreLib/src/System/Single.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1469,13 +1469,8 @@ 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;
#else
nuint actualResult = (value >= uint.MaxValue) ? uint.MaxValue :
(value <= uint.MinValue) ? uint.MinValue : (nuint)value;
#endif
nuint actualResult = (value >= nuint.MaxValue) ? nuint.MaxValue :
(value <= nuint.MinValue) ? nuint.MinValue : (nuint)value;
#else
nuint actualResult = (nuint)value;
#endif
Expand Down
7 changes: 1 addition & 6 deletions src/libraries/System.Private.CoreLib/src/System/UIntPtr.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,13 +486,8 @@ bool IBinaryInteger<nuint>.TryWriteLittleEndian(Span<byte> destination, out int
/// <inheritdoc cref="IBinaryNumber{TSelf}.AllBitsSet" />
static nuint IBinaryNumber<nuint>.AllBitsSet
{
#if TARGET_64BIT
[NonVersionable]
get => unchecked((nuint)0xFFFF_FFFF_FFFF_FFFF);
#else
[NonVersionable]
get => (nuint)0xFFFF_FFFF;
#endif
get => unchecked((nuint)nuint_t.MaxValue);
}

/// <inheritdoc cref="IBinaryNumber{TSelf}.IsPow2(TSelf)" />
Expand Down
Loading