Merge commit '93b23c84399b' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit d4ae6a633dbb · 2022-04-13T23:14:44.000Z
diff --git a/mlir/lib/Dialect/SCF/SCF.cpp b/mlir/lib/Dialect/SCF/SCF.cpp
@@ -1793,9 +1793,8 @@ struct CombineNestedIfs : public OpRewritePattern<IfOp> {
       // If the then value is defined within the scf.if, bail.
       if (tup.value().getParentRegion() == &op.getThenRegion()) {
         return failure();
-      } else {
-        elseYieldsToUpgradeToSelect.push_back(tup.index());
       }
+      elseYieldsToUpgradeToSelect.push_back(tup.index());
     }
 
     Location loc = op.getLoc();

Original file line number	Diff line number	Diff line change
`@@ -1793,9 +1793,8 @@ struct CombineNestedIfs : public OpRewritePattern<IfOp> {`
`1793`	`1793`	`// If the then value is defined within the scf.if, bail.`
`1794`	`1794`	`if (tup.value().getParentRegion() == &op.getThenRegion()) {`
`1795`	`1795`	`return failure();`
`1796`		`- } else {`
`1797`		`- elseYieldsToUpgradeToSelect.push_back(tup.index());`
`1798`	`1796`	`}`
	`1797`	`+ elseYieldsToUpgradeToSelect.push_back(tup.index());`
`1799`	`1798`	`}`
`1800`	`1799`
`1801`	`1800`	`Location loc = op.getLoc();`