Merge pull request #1038 from iskiselev/Unsigned_Comparison_1037

Support for unsigned comparison
sq · Feb 25, 2017 · d1914fa · d1914fa
2 parents 2751b07 + 8898c06
commit d1914fa
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 0 deletions.
diff --git a/JSIL/ILBlockTranslator.cs b/JSIL/ILBlockTranslator.cs
@@ -566,6 +566,22 @@ protected JSExpression Translate_BinaryOp (ILExpression node, JSBinaryOperator o
             var leftType = lhs.GetActualType(TypeSystem);
             var rightType = rhs.GetActualType(TypeSystem);
 
+            if (node.Code.GetName().Contains(".un"))
+            {
+                // We need emulate unsigned comaprison
+                var leftTypeUnsigned = TypeUtil.GetUnsignedType(leftType, TypeSystem);
+                if (leftType != leftTypeUnsigned)
+                {
+                    lhs = JSCastExpression.New(lhs, leftTypeUnsigned, TypeSystem, isCoercion: true);
+                }
+
+                var rightTypeUnsigned = TypeUtil.GetUnsignedType(rightType, TypeSystem);
+                if (rightType != rightTypeUnsigned)
+                {
+                    rhs = JSCastExpression.New(rhs, rightTypeUnsigned, TypeSystem, isCoercion: true);
+                }
+            }
+
             if (
                 TypeUtil.IsIntegral(leftType) && 
                 TypeUtil.IsIntegral(rightType) &&

diff --git a/JSIL/TypeUtil.cs b/JSIL/TypeUtil.cs
@@ -163,6 +163,40 @@ public static bool IsNumeric (TypeReference type) {
             }
         }
 
+        public static TypeReference GetUnsignedType(TypeReference type, TypeSystem typeSystem)
+        {
+            type = DereferenceType(type);
+
+            switch (type.MetadataType)
+            {
+                case MetadataType.UIntPtr:
+                case MetadataType.IntPtr:
+                    return typeSystem.UIntPtr;
+
+                case MetadataType.SByte:
+                case MetadataType.Byte:
+                    return typeSystem.Byte;
+
+                case MetadataType.Int16:
+                case MetadataType.UInt16:
+                    return typeSystem.UInt16;
+
+                case MetadataType.Int32:
+                case MetadataType.UInt32:
+                    return typeSystem.UInt32;
+
+                case MetadataType.Int64:
+                case MetadataType.UInt64:
+                    return typeSystem.UInt64;
+
+                case MetadataType.Char:
+                    return typeSystem.Char;
+
+                default:
+                    return type;
+            }
+        }
+
         public static bool? IsSigned (TypeReference type) {
             type = DereferenceType(type);
 

diff --git a/Tests/SimpleTestCases/ble.un.il b/Tests/SimpleTestCases/ble.un.il
@@ -0,0 +1,27 @@
+.assembly Hello {}
+.assembly extern mscorlib {}
+
+.class public abstract sealed Program
+	extends [mscorlib]System.Object
+{
+	.method static void Main()
+	{
+		.entrypoint
+		.maxstack 1
+
+		ldc.i4       -1
+		ldc.i4.5 
+		ble.un.s     END
+		ldstr        "int32"
+		call         void [mscorlib]System.Console::WriteLine(string)
+
+		ldc.i8       -1
+		ldc.i8       5 
+		ble.un.s     END
+		ldstr        "int64"
+		call         void [mscorlib]System.Console::WriteLine(string)
+
+		END:
+		ret
+	}
+}
diff --git a/Tests/SimpleTests.csproj b/Tests/SimpleTests.csproj
@@ -66,6 +66,7 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config" />
+    <None Include="SimpleTestCases\ble.un.il" />
     <None Include="SimpleTestCases\Issue538.cs" />
     <None Include="SimpleTestCases\Issue567.cs" />
     <None Include="SimpleTestCasesForStubbedBcl\Issue585.cs" />