Fix wrong codegen for comparing 16-bit unsigned values

The changes fix a bug generating 16-bit signed comparison code to
compare unsigned 16-bit values.

1 files changed, 21 insertions, 34 deletions

diff --git a/src/jit/lowerxarch.cpp b/src/jit/lowerxarch.cpp
index 14412b7f66..369f81b7bd 100644
--- a/src/jit/lowerxarch.cpp
+++ b/src/jit/lowerxarch.cpp
@@ -2884,40 +2884,27 @@ void Lowering::LowerCmp(GenTreePtr tree)
             }
         }
     }
-    else if (op2->isMemoryOp())
-    {
-        if (op1Type == op2Type)
-        {
-            MakeSrcContained(tree, op2);
-
-            // Mark the tree as doing unsigned comparison if
-            // both the operands are small and unsigned types.
-            // Otherwise we will end up performing a signed comparison
-            // of two small unsigned values without zero extending them to
-            // TYP_INT size and which is incorrect.
-            if (varTypeIsSmall(op1Type) && varTypeIsUnsigned(op1Type))
-            {
-                tree->gtFlags |= GTF_UNSIGNED;
-            }
-        }
-    }
-    else if (op1->isMemoryOp()) 
-    {
-        if ((op1Type == op2Type) && IsSafeToContainMem(tree, op1))
-        {
-            MakeSrcContained(tree, op1);
-
-            // Mark the tree as doing unsigned comparison if
-            // both the operands are small and unsigned types.
-            // Otherwise we will end up performing a signed comparison
-            // of two small unsigned values without zero extending them to
-            // TYP_INT size and which is incorrect.
-            if (varTypeIsSmall(op1Type) && varTypeIsUnsigned(op1Type))
-            {
-                tree->gtFlags |= GTF_UNSIGNED;
-            }
-        }
-    }
+	else if (op1Type == op2Type)
+	{
+		if (op2->isMemoryOp())
+		{
+			MakeSrcContained(tree, op2);
+		}
+		else if (op1->isMemoryOp() && IsSafeToContainMem(tree, op1))
+		{
+			MakeSrcContained(tree, op1);
+		}
+
+		if (varTypeIsSmall(op1Type) && varTypeIsUnsigned(op1Type))
+		{
+			// Mark the tree as doing unsigned comparison if
+			// both the operands are small and unsigned types.
+			// Otherwise we will end up performing a signed comparison
+			// of two small unsigned values without zero extending them to
+			// TYP_INT size and which is incorrect.
+			tree->gtFlags |= GTF_UNSIGNED;
+		}
+	}
 }
 
 /* Lower GT_CAST(srcType, DstType) nodes.