Skip to content

Fix unsigned int to floating point number conversion #491

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

Open
exyi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix unsigned int to floating point number conversion #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/FastExpressionCompiler/FastExpressionCompiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3508,10 +3508,12 @@ private static bool TryEmitPrimitiveValueConvert(Type sourceType, Type targetTyp
il.Demit(isChecked ? OpCodes.Conv_Ovf_I8 : OpCodes.Conv_I8);
break;
case TypeCode.Double:
if (sourceType.IsUnsigned())
il.Demit(OpCodes.Conv_R_Un);
il.Demit(OpCodes.Conv_R8);
break;
case TypeCode.Single:
if (sourceType == typeof(uint))
if (sourceType.IsUnsigned())
il.Demit(OpCodes.Conv_R_Un);
il.Demit(OpCodes.Conv_R4);
break;
Expand Down
30 changes: 29 additions & 1 deletion test/FastExpressionCompiler.UnitTests/UnaryExpressionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public int Run()
ArrayLength_compiles();
Convert_compiles();
ConvertChecked_compiles();
ConvertToFloat();
Increment_Constant_compiles();
Decrement_compiles();
Increment_compiles();
Expand All @@ -52,7 +53,7 @@ public int Run()
UnaryPlus_compiles();
Unbox_compiles();

return 27;
return 28;
}


Expand Down Expand Up @@ -95,6 +96,33 @@ public void ConvertChecked_compiles()
Asserts.AreEqual(1, result);
}

public void ConvertToFloat()
{
var tests = new object[] {
sbyte.MinValue, sbyte.MaxValue,
short.MinValue, short.MaxValue,
int.MinValue, int.MaxValue,
long.MinValue, long.MaxValue,
uint.MaxValue, uint.MaxValue - 1,
ulong.MaxValue, ulong.MaxValue-10000,
ushort.MaxValue, byte.MaxValue,
char.MaxValue, 'a',
true, false,
double.MaxValue, float.MaxValue, (float)float.Epsilon,
#if NET7_0_OR_GREATER
Int128.MaxValue, Int128.MinValue, UInt128.MaxValue, // these use op_Explicit, but there isn't much coverage of that anyway
#endif
};
foreach (var constant in tests)
{
var toFloat32 = Lambda<Func<float>>(Convert(Constant(constant), typeof(float)));
var toFloat64 = Lambda<Func<double>>(Convert(Constant(constant), typeof(double)));

Asserts.AreEqual(toFloat32.CompileSys()(), toFloat32.CompileFast(true)(), $"(float){constant.ToCode()}");
Asserts.AreEqual(toFloat64.CompileSys()(), toFloat64.CompileFast(true)(), $"(double){constant.ToCode()}");
}
}


public void Increment_Constant_compiles()
{
Expand Down