Make sure we don't do optimizations when we shouldn't

tannergooding · tannergooding · commit 0ef01c2ccaa7 · 2024-06-06T14:17:58.000-07:00
diff --git a/src/coreclr/jit/morph.cpp b/src/coreclr/jit/morph.cpp
@@ -11208,6 +11208,11 @@ GenTree* Compiler::fgOptimizeHWIntrinsic(GenTreeHWIntrinsic* node)
         }
     }
 
+    if (!fgGlobalMorph)
+    {
+        return node;
+    }
+
     switch (oper)
     {
         case GT_ADD:
@@ -11359,7 +11364,7 @@ GenTree* Compiler::fgOptimizeCommutativeArithmetic(GenTreeOp* tree)
     {
         // TODO-Review: We used to assert here that "(!op2->OperIsConst() || !opts.OptEnabled(CLFLG_CONSTANTFOLD))".
         // This may indicate a missed "remorph". Task is to re-enable this assertion and investigate.
-
+        std::swap(tree->gtOp1, tree->gtOp2);
     }
 
     if (fgOperIsBitwiseRotationRoot(tree->OperGet()))

Original file line number	Diff line number	Diff line change
`@@ -11208,6 +11208,11 @@ GenTree* Compiler::fgOptimizeHWIntrinsic(GenTreeHWIntrinsic* node)`
`11208`	`11208`	`}`
`11209`	`11209`	`}`
`11210`	`11210`
	`11211`	`+ if (!fgGlobalMorph)`
	`11212`	`+ {`
	`11213`	`+ return node;`
	`11214`	`+ }`
	`11215`	`+`
`11211`	`11216`	`switch (oper)`
`11212`	`11217`	`{`
`11213`	`11218`	`case GT_ADD:`
`@@ -11359,7 +11364,7 @@ GenTree* Compiler::fgOptimizeCommutativeArithmetic(GenTreeOp* tree)`
`11359`	`11364`	`{`
`11360`	`11365`	`// TODO-Review: We used to assert here that "(!op2->OperIsConst() \|\| !opts.OptEnabled(CLFLG_CONSTANTFOLD))".`
`11361`	`11366`	`// This may indicate a missed "remorph". Task is to re-enable this assertion and investigate.`
`11362`		`-`
	`11367`	`+ std::swap(tree->gtOp1, tree->gtOp2);`
`11363`	`11368`	`}`
`11364`	`11369`
`11365`	`11370`	`if (fgOperIsBitwiseRotationRoot(tree->OperGet()))`