Reverted Morph changes (dotnet#61412)

SkiFoD · Mar 15, 2022 · f62c64b · f62c64b
1 parent 0bf5965
commit f62c64b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/coreclr/jit/morph.cpp b/src/coreclr/jit/morph.cpp
@@ -12180,12 +12180,13 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac)
             if (!optValnumCSE_phase && op2->IsIntegralConst())
             {
                 tree = fgOptimizeEqualityComparisonWithConst(tree->AsOp());
+                assert(tree->OperIsCompare());
 
                 oper = tree->OperGet();
                 op1  = tree->gtGetOp1();
                 op2  = tree->gtGetOp2();
             }
-            break;
+            goto COMPARE;
 
         case GT_LT:
         case GT_LE:
@@ -13217,7 +13218,7 @@ GenTree* Compiler::fgOptimizeCast(GenTreeCast* cast)
 //
 // Return Value:
 //    The optimized tree, "cmp" in case no optimizations were done.
-//    Currently only returns GTK_SMPOP trees.
+//    Currently only returns relop trees.
 //
 GenTree* Compiler::fgOptimizeEqualityComparisonWithConst(GenTreeOp* cmp)
 {