Extend flag reuse optimization to all relops

mikedn · mikedn · commit d893beb261cf · 2017-09-23T14:34:01.000+03:00
diff --git a/src/jit/codegenxarch.cpp b/src/jit/codegenxarch.cpp
@@ -887,7 +887,8 @@ void CodeGen::genCodeForBinary(GenTree* treeNode)
     }
 
     // try to use an inc or dec
-    if (oper == GT_ADD && !varTypeIsFloating(treeNode) && src->isContainedIntOrIImmed() && !treeNode->gtOverflowEx())
+    if (oper == GT_ADD && !varTypeIsFloating(treeNode) && src->isContainedIntOrIImmed() && !treeNode->gtOverflowEx() &&
+        !treeNode->gtSetFlags())
     {
         if (src->IsIntegralConst(1))
         {
diff --git a/src/jit/lower.cpp b/src/jit/lower.cpp
@@ -2602,7 +2602,7 @@ GenTree* Lowering::LowerCompare(GenTree* cmp)
             return cmp->gtNext;
         }
     }
-    else if (cmp->OperIs(GT_EQ, GT_NE))
+    else
     {
         GenTree* op1 = cmp->gtGetOp1();
         GenTree* op2 = cmp->gtGetOp2();

Original file line number	Diff line number	Diff line change
`@@ -887,7 +887,8 @@ void CodeGen::genCodeForBinary(GenTree* treeNode)`
`887`	`887`	`}`
`888`	`888`
`889`	`889`	`// try to use an inc or dec`
`890`		`- if (oper == GT_ADD && !varTypeIsFloating(treeNode) && src->isContainedIntOrIImmed() && !treeNode->gtOverflowEx())`
	`890`	`+ if (oper == GT_ADD && !varTypeIsFloating(treeNode) && src->isContainedIntOrIImmed() && !treeNode->gtOverflowEx() &&`
	`891`	`+ !treeNode->gtSetFlags())`
`891`	`892`	`{`
`892`	`893`	`if (src->IsIntegralConst(1))`
`893`	`894`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2602,7 +2602,7 @@ GenTree* Lowering::LowerCompare(GenTree* cmp)`
`2602`	`2602`	`return cmp->gtNext;`
`2603`	`2603`	`}`
`2604`	`2604`	`}`
`2605`		`- else if (cmp->OperIs(GT_EQ, GT_NE))`
	`2605`	`+ else`
`2606`	`2606`	`{`
`2607`	`2607`	`GenTree* op1 = cmp->gtGetOp1();`
`2608`	`2608`	`GenTree* op2 = cmp->gtGetOp2();`