Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Updating the new System.MathF calls which already existed in System.Math to call the System.Math implementation. #7721

Merged
janvorli merged 2 commits into from
Oct 19, 2016
Merged

Updating the new System.MathF calls which already existed in System.Math to call the System.Math implementation. #7721

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
9d8f71a
Updating the new `System.MathF` calls which already existed in `Syste…
tannergooding Oct 19, 2016
ed80050
Removing the FCALL entry for MathF.Abs
tannergooding Oct 19, 2016
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
25 changes: 4 additions & 21 deletions src/mscorlib/src/System/MathF.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down Expand Up @@ -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)]
Expand Down Expand Up @@ -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)]
Expand Down
1 change: 0 additions & 1 deletion src/vm/ecalllist.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down