Apply comments

dotnet · Jan 31, 2024 · 1ffe5fa · 1ffe5fa
1 parent d72d6b0
commit 1ffe5fa
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/libraries/Common/tests/TestUtilities/System/AssertExtensions.cs b/src/libraries/Common/tests/TestUtilities/System/AssertExtensions.cs
@@ -1130,11 +1130,17 @@ public static void Equal(Half expected, Half actual, Half variance)
         /// <exception cref="EqualException">Thrown when the representations are not identical</exception>
         public static void Equal(double expected, double actual)
         {
-            if (BitConverter.DoubleToInt64Bits(expected) == BitConverter.DoubleToInt64Bits(actual))
+            if (BitConverter.ToInt64(BitConverter.GetBytes(expected)) == BitConverter.ToInt64(BitConverter.GetBytes(actual)))
             {
                 return;
             }
 
+            if (PlatformDetection.IsRiscV64Process && double.IsNaN(expected) && double.IsNaN(actual))
+            {
+                // RISC-V does not preserve payload
+                return;
+            }
+
             throw EqualException.ForMismatchedValues(ToStringPadded(expected), ToStringPadded(actual));
         }
 
@@ -1144,7 +1150,7 @@ public static void Equal(double expected, double actual)
         /// <exception cref="EqualException">Thrown when the representations are not identical</exception>
         public static void Equal(float expected, float actual)
         {
-            if (BitConverter.SingleToInt32Bits(expected) == BitConverter.SingleToInt32Bits(actual))
+            if (BitConverter.ToInt32(BitConverter.GetBytes(expected)) == BitConverter.ToInt32(BitConverter.GetBytes(actual)))
             {
                 return;
             }
@@ -1165,7 +1171,7 @@ public static void Equal(float expected, float actual)
         /// <exception cref="EqualException">Thrown when the representations are not identical</exception>
         public static void Equal(Half expected, Half actual)
         {
-            if (BitConverter.HalfToUInt16Bits(expected) == BitConverter.HalfToUInt16Bits(actual))
+            if (BitConverter.ToInt16(BitConverter.GetBytes(expected)) == BitConverter.ToInt16(BitConverter.GetBytes(actual)))
             {
                 return;
             }