refactor GetNextIntBoolOpToOptimize

Author: pedrobsaila

src/coreclr/jit/optimizebools.cpp

@@ -1777,6 +1777,25 @@ void ReinitIntBoolOpDsc(IntBoolOpDsc* intBoolOpDsc)
     intBoolOpDsc->lclVarArrLength = 0;
 }
 
+//-----------------------------------------------------------------------------
+// GetNextOrOp:   Function used for searching the next GT_OR node
+//
+// Arguments:
+//      b3    the tree to inspect
+//
+// Return:
+//      On success, return the next GT_OR node or nullptr if it fails
+//
+GenTree* GetNextOrOp(GenTree* b4)
+{
+    while (b4 != nullptr && !b4->OperIs(GT_OR))
+    {
+        b4 = b4->gtPrev;
+    }
+
+    return b4;
+}
+
 //-----------------------------------------------------------------------------
 // GetNextIntBoolOpToOptimize:   Function used for searching constant INT OR operation that can be folded
 //
@@ -1802,25 +1821,20 @@ IntBoolOpDsc* GetNextIntBoolOpToOptimize(GenTree* b3)
     intBoolOpDsc->lclVarArrLength = 0;
     intBoolOpDsc->start           = nullptr;
     intBoolOpDsc->end             = nullptr;
-    int orOpCount                 = 1;
+    int orOpCount                 = 2;
 
-    GenTree* b4 = b3->gtPrev;
+    GenTree* b4 = GetNextOrOp(b3->gtPrev);
 
-    while (b4 != nullptr && !b4->OperIs(GT_OR))
+    if (b4 != nullptr)
     {
-        b4 = b4->gtPrev;
+        intBoolOpDsc->start = b4->gtNext;
+        b4                  = b4->gtPrev;
     }
 
     while (b4 != nullptr)
     {
         if (!b4->OperIs(GT_OR, GT_LCL_VAR, GT_CNS_INT) || !b4->TypeIs(TYP_INT))
         {
-            if (intBoolOpDsc->start == nullptr)
-            {
-                b4 = b4->gtPrev;
-                continue;
-            }
-
             if (intBoolOpDsc->ctsArrayLength >= 2 && intBoolOpDsc->lclVarArrLength >= 2)
             {
                 intBoolOpDsc->end = b4;
@@ -1829,98 +1843,92 @@ IntBoolOpDsc* GetNextIntBoolOpToOptimize(GenTree* b3)
             else
             {
                 ReinitIntBoolOpDsc(intBoolOpDsc);
-                b4        = b4->gtPrev;
-                orOpCount = 0;
-                continue;
-            }
-        }
+                b4 = GetNextOrOp(b4);
 
-        if (intBoolOpDsc->start == nullptr)
-        {
-            intBoolOpDsc->start = b4->gtNext;
+                if (b4 != nullptr)
+                {
+                    orOpCount           = 2;
+                    intBoolOpDsc->start = b4->gtNext;
+                }
+                else
+                {
+                    break;
+                }
+            }
         }
 
-        switch (b4->gtOper)
+        if (orOpCount <= 0)
         {
-            case GT_LCL_VAR:
+            if (intBoolOpDsc->ctsArrayLength >= 2 && intBoolOpDsc->lclVarArrLength >= 2)
             {
-                if (orOpCount <= 0)
-                {
-                    if (intBoolOpDsc->ctsArrayLength >= 2 && intBoolOpDsc->lclVarArrLength >= 2)
-                    {
-                        intBoolOpDsc->end = b4;
-                        return intBoolOpDsc;
-                    }
+                intBoolOpDsc->end = b4;
+                return intBoolOpDsc;
+            }
 
-                    ReinitIntBoolOpDsc(intBoolOpDsc);
-                    break;
-                }
+            ReinitIntBoolOpDsc(intBoolOpDsc);
 
-                intBoolOpDsc->lclVarArrLength++;
-                if (intBoolOpDsc->lclVarArr == nullptr)
-                {
-                    intBoolOpDsc->lclVarArr =
-                        reinterpret_cast<GenTree**>(malloc(sizeof(GenTree*) * intBoolOpDsc->lclVarArrLength));
-                }
-                else
-                {
-                    intBoolOpDsc->lclVarArr = reinterpret_cast<GenTree**>(
-                        realloc(intBoolOpDsc->lclVarArr, sizeof(GenTree*) * intBoolOpDsc->lclVarArrLength));
-                }
+            if (!b4->OperIs(GT_OR))
+            {
+                b4 = GetNextOrOp(b4);
+            }
 
-                intBoolOpDsc->lclVarArr[intBoolOpDsc->lclVarArrLength - 1] = b4;
-                orOpCount--;
+            if (b4 != nullptr)
+            {
+                orOpCount           = 2;
+                intBoolOpDsc->start = b4->gtNext;
+            }
+            else
+            {
                 break;
             }
-            case GT_CNS_INT:
+        }
+        else
+        {
+            switch (b4->gtOper)
             {
-                if (orOpCount <= 0)
+                case GT_LCL_VAR:
                 {
-                    if (intBoolOpDsc->ctsArrayLength >= 2 && intBoolOpDsc->lclVarArrLength >= 2)
+                    intBoolOpDsc->lclVarArrLength++;
+                    if (intBoolOpDsc->lclVarArr == nullptr)
                     {
-                        intBoolOpDsc->end = b4;
-                        return intBoolOpDsc;
+                        intBoolOpDsc->lclVarArr =
+                            reinterpret_cast<GenTree**>(malloc(sizeof(GenTree*) * intBoolOpDsc->lclVarArrLength));
+                    }
+                    else
+                    {
+                        intBoolOpDsc->lclVarArr = reinterpret_cast<GenTree**>(
+                            realloc(intBoolOpDsc->lclVarArr, sizeof(GenTree*) * intBoolOpDsc->lclVarArrLength));
                     }
 
-                    ReinitIntBoolOpDsc(intBoolOpDsc);
+                    intBoolOpDsc->lclVarArr[intBoolOpDsc->lclVarArrLength - 1] = b4;
+                    orOpCount--;
                     break;
                 }
-
-                intBoolOpDsc->ctsArrayLength++;
-                if (intBoolOpDsc->ctsArray == nullptr)
-                {
-                    intBoolOpDsc->ctsArray =
-                        reinterpret_cast<ssize_t*>(malloc(sizeof(ssize_t) * intBoolOpDsc->ctsArrayLength));
-                }
-                else
-                {
-                    intBoolOpDsc->ctsArray = reinterpret_cast<ssize_t*>(
-                        realloc(intBoolOpDsc->ctsArray, sizeof(ssize_t) * intBoolOpDsc->ctsArrayLength));
-                }
-                ssize_t constant                                         = b4->AsIntConCommon()->IconValue();
-                intBoolOpDsc->ctsArray[intBoolOpDsc->ctsArrayLength - 1] = constant;
-                orOpCount--;
-                break;
-            }
-            case GT_OR:
-                if (orOpCount <= 0)
+                case GT_CNS_INT:
                 {
-                    if (intBoolOpDsc->ctsArrayLength >= 2 && intBoolOpDsc->lclVarArrLength >= 2)
+                    intBoolOpDsc->ctsArrayLength++;
+                    if (intBoolOpDsc->ctsArray == nullptr)
                     {
-                        intBoolOpDsc->end = b4;
-                        return intBoolOpDsc;
+                        intBoolOpDsc->ctsArray =
+                            reinterpret_cast<ssize_t*>(malloc(sizeof(ssize_t) * intBoolOpDsc->ctsArrayLength));
                     }
-
-                    ReinitIntBoolOpDsc(intBoolOpDsc);
-                    orOpCount           = 1;
-                    intBoolOpDsc->start = b4->gtNext;
+                    else
+                    {
+                        intBoolOpDsc->ctsArray = reinterpret_cast<ssize_t*>(
+                            realloc(intBoolOpDsc->ctsArray, sizeof(ssize_t) * intBoolOpDsc->ctsArrayLength));
+                    }
+                    ssize_t constant                                         = b4->AsIntConCommon()->IconValue();
+                    intBoolOpDsc->ctsArray[intBoolOpDsc->ctsArrayLength - 1] = constant;
+                    orOpCount--;
+                    break;
+                }
+                case GT_OR:
+                    orOpCount++;
+                    break;
+                default:
+                {
+                    break;
                 }
-
-                orOpCount++;
-                break;
-            default:
-            {
-                break;
             }
         }