diff --git a/src/mscorlib/src/System/MathF.cs b/src/mscorlib/src/System/MathF.cs index bca5559b803e..2514eee387ab 100644 --- a/src/mscorlib/src/System/MathF.cs +++ b/src/mscorlib/src/System/MathF.cs @@ -33,8 +33,7 @@ public static class MathF public const float E = 2.71828183f; [System.Security.SecuritySafeCritical] // auto-generated - [MethodImplAttribute(MethodImplOptions.InternalCall)] - public static extern float Abs(float x); + public static float Abs(float x) => Math.Abs(x); [System.Security.SecuritySafeCritical] // auto-generated [MethodImplAttribute(MethodImplOptions.InternalCall)] @@ -157,10 +156,10 @@ public static float Log(float x, float y) public static extern float Log10(float x); [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)] - public static float Max(float x, float y) => ((x > y) || float.IsNaN(x)) ? x : y; + public static float Max(float x, float y) => Math.Max(x, y); [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)] - public static float Min(float x, float y) => ((x < y) || float.IsNaN(x)) ? x : y; + public static float Min(float x, float y) => Math.Min(x, y); [System.Security.SecuritySafeCritical] // auto-generated [MethodImplAttribute(MethodImplOptions.InternalCall)] @@ -208,23 +207,7 @@ public static float Round(float x, MidpointRounding mode) return InternalRound(x, 0, mode); } - public static int Sign(float x) - { - if (x < 0) - { - return -1; - } - else if (x > 0) - { - return 1; - } - else if (x == 0) - { - return 0; - } - - throw new ArithmeticException(Environment.GetResourceString("Arithmetic_NaN")); - } + public static int Sign(float x) => Math.Sign(x); [System.Security.SecuritySafeCritical] // auto-generated [MethodImplAttribute(MethodImplOptions.InternalCall)] diff --git a/src/vm/ecalllist.h b/src/vm/ecalllist.h index 2277b0347022..ea0cad35df27 100644 --- a/src/vm/ecalllist.h +++ b/src/vm/ecalllist.h @@ -1252,7 +1252,6 @@ FCFuncStart(gMathFuncs) FCFuncEnd() FCFuncStart(gMathFFuncs) - FCIntrinsic("Abs", COMSingle::Abs, CORINFO_INTRINSIC_Abs) FCIntrinsic("Acos", COMSingle::Acos, CORINFO_INTRINSIC_Acos) FCIntrinsic("Asin", COMSingle::Asin, CORINFO_INTRINSIC_Asin) FCIntrinsic("Atan", COMSingle::Atan, CORINFO_INTRINSIC_Atan)