Merge commit '7de2e4971f8a' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 8120b563df7d · 2025-04-24T15:16:18.000-07:00
diff --git a/mlir/include/mlir/Dialect/Utils/ReshapeOpsUtils.h b/mlir/include/mlir/Dialect/Utils/ReshapeOpsUtils.h
@@ -57,7 +57,7 @@ getSymbolLessAffineMaps(ArrayRef<ReassociationExprs> reassociation);
 
 /// Wraps a list of reassociations in an ArrayAttr.
 ArrayAttr
-getReassociationIndicesAttribute(OpBuilder &b,
+getReassociationIndicesAttribute(Builder &b,
                                  ArrayRef<ReassociationIndices> reassociation);
 
 /// Convert Array<Array<AffineExpr>> to Array<Array<int64_t>>.
diff --git a/mlir/lib/Dialect/Utils/ReshapeOpsUtils.cpp b/mlir/lib/Dialect/Utils/ReshapeOpsUtils.cpp
@@ -158,7 +158,7 @@ unsigned getMaxPosOfType(ArrayRef<ReassociationExprs> exprArrays) {
 }
 
 ArrayAttr mlir::getReassociationIndicesAttribute(
-    OpBuilder &b, ArrayRef<ReassociationIndices> reassociation) {
+    Builder &b, ArrayRef<ReassociationIndices> reassociation) {
   SmallVector<Attribute, 4> reassociationAttr =
       llvm::to_vector<4>(llvm::map_range(
           reassociation, [&](const ReassociationIndices &indices) -> Attribute {

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ unsigned getMaxPosOfType(ArrayRef<ReassociationExprs> exprArrays) {`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`ArrayAttr mlir::getReassociationIndicesAttribute(`
`161`		`- OpBuilder &b, ArrayRef<ReassociationIndices> reassociation) {`
	`161`	`+ Builder &b, ArrayRef<ReassociationIndices> reassociation) {`
`162`	`162`	`SmallVector<Attribute, 4> reassociationAttr =`
`163`	`163`	`llvm::to_vector<4>(llvm::map_range(`
`164`	`164`	`reassociation, [&](const ReassociationIndices &indices) -> Attribute {`