Try another fix

Author: hez2010

src/coreclr/jit/compiler.h

@@ -3747,7 +3747,7 @@ class Compiler
 
     //-------------------------------------------------------------------------
 
-    GenTree* gtFoldExpr(GenTree* tree, bool* folded = nullptr);
+    GenTree* gtFoldExpr(GenTree* tree);
     GenTree* gtFoldExprConst(GenTree* tree);
     GenTree* gtFoldIndirConst(GenTreeIndir* indir);
     GenTree* gtFoldExprSpecial(GenTree* tree);

src/coreclr/jit/gentree.cpp

@@ -13572,13 +13572,10 @@ void Compiler::gtDispLIRNode(GenTree* node, const char* prefixMsg /* = nullptr *
  *  and call the methods to perform the folding
  */
 
-GenTree* Compiler::gtFoldExpr(GenTree* tree, bool* folded)
+GenTree* Compiler::gtFoldExpr(GenTree* tree)
 {
     unsigned kind = tree->OperKind();
 
-    if (folded != nullptr)
-        *folded = false;
-
     /* We must have a simple operation to fold */
 
     // If we're in CSE, it's not safe to perform tree
@@ -13598,19 +13595,13 @@ GenTree* Compiler::gtFoldExpr(GenTree* tree, bool* folded)
     {
         if (tree->OperIsConditional())
         {
-            GenTree* newTree = gtFoldExprConditional(tree);
-            if (folded != nullptr)
-                *folded = newTree != tree;
-            return newTree;
+            return gtFoldExprConditional(tree);
         }
 
 #if defined(FEATURE_HW_INTRINSICS)
         if (tree->OperIsHWIntrinsic())
         {
-            GenTree* newTree = gtFoldExprHWIntrinsic(tree->AsHWIntrinsic());
-            if (folded != nullptr)
-                *folded = newTree != tree;
-            return newTree;
+            return gtFoldExprHWIntrinsic(tree->AsHWIntrinsic());
         }
 #endif // FEATURE_HW_INTRINSICS
 
@@ -13638,7 +13629,6 @@ GenTree* Compiler::gtFoldExpr(GenTree* tree, bool* folded)
     {
         if (op1->OperIsConst())
         {
-            // constants folding results in a new tree that may be folded again, don't mark it as folded
             return gtFoldExprConst(tree);
         }
     }
@@ -13650,8 +13640,7 @@ GenTree* Compiler::gtFoldExpr(GenTree* tree, bool* folded)
         // one of their arguments is an address.
         if (op1->OperIsConst() && op2->OperIsConst() && !tree->OperIsAtomicOp())
         {
-            // both nodes are constants - fold the expression
-            // constants folding results in a new tree that may be folded again, don't mark it as folded
+            /* both nodes are constants - fold the expression */
             return gtFoldExprConst(tree);
         }
         else if (op1->OperIsConst() || op2->OperIsConst())
@@ -13666,19 +13655,13 @@ GenTree* Compiler::gtFoldExpr(GenTree* tree, bool* folded)
                 return tree;
             }
 
-            GenTree* newTree = gtFoldExprSpecial(tree);
-            if (folded != nullptr)
-                *folded = newTree != tree;
-            return newTree;
+            return gtFoldExprSpecial(tree);
         }
         else if (tree->OperIsCompare())
         {
             /* comparisons of two local variables can sometimes be folded */
 
-            GenTree* newTree = gtFoldExprCompare(tree);
-            if (folded != nullptr)
-                *folded = newTree != tree;
-            return newTree;
+            return gtFoldExprCompare(tree);
         }
     }
 

src/coreclr/jit/morph.cpp

@@ -8305,25 +8305,18 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optA
     }
 
     // Try to fold it, maybe we get lucky,
-    bool folded;
-    tree = gtFoldExpr(tree, &folded);
+    tree = gtFoldExpr(tree);
 
     if (oldTree != tree)
     {
-        if (folded)
-        {
-            INDEBUG(tree->gtDebugFlags |= GTF_DEBUG_NODE_MORPHED);
-            return tree;
-        }
-
         /* if gtFoldExpr returned op1 or op2 then we are done */
         if ((tree == op1) || (tree == op2) || (tree == qmarkOp1) || (tree == qmarkOp2))
         {
             return tree;
         }
 
         /* If we created a comma-throw tree then we need to morph op1 */
-        if (fgIsCommaThrow(tree))
+        if (!fgGlobalMorph && fgIsCommaThrow(tree))
         {
             tree->AsOp()->gtOp1 = fgMorphTree(tree->AsOp()->gtOp1);
             fgMorphTreeDone(tree);