Skip to content

Allow platform NaN canonicalization in floating-point assertions #134316

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
tannergooding merged 2 commits into from
Sep 22, 2026
+11 −20
Merged

Allow platform NaN canonicalization in floating-point assertions #134316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf4644e
Allow platform NaN canonicalization in floating-point assertions
tannergooding Sep 21, 2026
6b25d1f
Merge upstream main and retain Wasm NaN test coverage
tannergooding Sep 21, 2026
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
18 changes: 4 additions & 14 deletions src/libraries/Common/tests/System/GenericMathTestMemberData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1372,13 +1372,8 @@ public static IEnumerable<object[]> MaxDouble
yield return new object[] { double.NegativeInfinity, double.NaN, double.NaN };
yield return new object[] { double.NaN, double.PositiveInfinity, double.NaN };
yield return new object[] { double.NaN, double.NegativeInfinity, double.NaN };
// [ActiveIssue("https://github.com/dotnet/runtime/issues/133311")]
// [ActiveIssue("https://github.com/dotnet/runtime/issues/134268")]
if (!((PlatformDetection.IsMonoRuntime && PlatformDetection.IsWasm) || PlatformDetection.IsWasmReadyToRun))
{
yield return new object[] { PositiveNaNDouble, -0.0, PositiveNaNDouble };
yield return new object[] { -0.0, NegativeNaNDouble, NegativeNaNDouble };
}
yield return new object[] { PositiveNaNDouble, -0.0, PositiveNaNDouble };
yield return new object[] { -0.0, NegativeNaNDouble, NegativeNaNDouble };
yield return new object[] { -0.0f, 0.0f, 0.0f };
yield return new object[] { 0.0f, -0.0f, 0.0f };
yield return new object[] { 2.0f, -3.0f, 2.0f };
Expand Down Expand Up @@ -1577,13 +1572,8 @@ public static IEnumerable<object[]> MinDouble
yield return new object[] { double.NegativeInfinity, double.NaN, double.NaN };
yield return new object[] { double.NaN, double.PositiveInfinity, double.NaN };
yield return new object[] { double.NaN, double.NegativeInfinity, double.NaN };
// [ActiveIssue("https://github.com/dotnet/runtime/issues/133311")]
// [ActiveIssue("https://github.com/dotnet/runtime/issues/134268")]
if (!((PlatformDetection.IsMonoRuntime && PlatformDetection.IsWasm) || PlatformDetection.IsWasmReadyToRun))
{
yield return new object[] { PositiveNaNDouble, -0.0, PositiveNaNDouble };
yield return new object[] { -0.0, NegativeNaNDouble, NegativeNaNDouble };
}
yield return new object[] { PositiveNaNDouble, -0.0, PositiveNaNDouble };
yield return new object[] { -0.0, NegativeNaNDouble, NegativeNaNDouble };
yield return new object[] { -0.0f, 0.0f, -0.0f };
yield return new object[] { 0.0f, -0.0f, -0.0f };
yield return new object[] { 2.0f, -3.0f, -3.0f };
Expand Down
9 changes: 3 additions & 6 deletions src/libraries/Common/tests/TestUtilities/System/AssertExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,9 +1222,8 @@ public static void Equal(double expected, double actual)
return;
}

if (PlatformDetection.IsRiscV64Process && double.IsNaN(expected) && double.IsNaN(actual))
if (!PlatformDetection.IsNaNPayloadPreservationExpected && double.IsNaN(expected) && double.IsNaN(actual))
Comment thread
tannergooding marked this conversation as resolved.
Comment thread
tannergooding marked this conversation as resolved.
{
// RISC-V does not preserve payload
return;
}

Expand All @@ -1247,9 +1246,8 @@ static unsafe int SingleToInt32Bits(float value)
return;
}

if (PlatformDetection.IsRiscV64Process && float.IsNaN(expected) && float.IsNaN(actual))
if (!PlatformDetection.IsNaNPayloadPreservationExpected && float.IsNaN(expected) && float.IsNaN(actual))
{
// RISC-V does not preserve payload
return;
}

Expand All @@ -1268,9 +1266,8 @@ public static void Equal(Half expected, Half actual)
return;
}

if (PlatformDetection.IsRiscV64Process && Half.IsNaN(expected) && Half.IsNaN(actual))
if (!PlatformDetection.IsNaNPayloadPreservationExpected && Half.IsNaN(expected) && Half.IsNaN(actual))
{
// RISC-V does not preserve payload
return;
}

Expand Down
4 changes: 4 additions & 0 deletions src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ public static partial class PlatformDetection
public static bool Is64BitProcess => IntPtr.Size == 8;
public static bool IsNotWindows => !IsWindows;

// Test expectation for floating-point operations, not a platform-wide guarantee.
// Bitcasts and other explicitly bit-preserving operations should still be tested exactly.
public static bool IsNaNPayloadPreservationExpected => !IsRiscV64Process && !IsWasm;

private static volatile int s_isPrivilegedProcess = -1;
public static bool IsPrivilegedProcess
{
Expand Down
Loading