[mlir] Use llvm::hasSingleElement (NFC) (#133648)

kazutakahirata · web-flow · commit 1c8647a25a5a · 2025-03-30T12:21:21.000-07:00
diff --git a/mlir/lib/Dialect/SPIRV/IR/ControlFlowOps.cpp b/mlir/lib/Dialect/SPIRV/IR/ControlFlowOps.cpp
@@ -255,8 +255,7 @@ static bool hasOneBranchOpTo(Block &srcBlock, Block &dstBlock) {
 
 /// Returns true if the given `block` only contains one `spirv.mlir.merge` op.
 static bool isMergeBlock(Block &block) {
-  return !block.empty() && std::next(block.begin()) == block.end() &&
-         isa<spirv::MergeOp>(block.front());
+  return llvm::hasSingleElement(block) && isa<spirv::MergeOp>(block.front());
 }
 
 /// Returns true if a `spirv.mlir.merge` op outside the merge block.

Original file line number	Diff line number	Diff line change
`@@ -255,8 +255,7 @@ static bool hasOneBranchOpTo(Block &srcBlock, Block &dstBlock) {`
`255`	`255`
`256`	`256`	/// Returns true if the given `block` only contains one `spirv.mlir.merge` op.
`257`	`257`	`static bool isMergeBlock(Block &block) {`
`258`		`- return !block.empty() && std::next(block.begin()) == block.end() &&`
`259`		`- isa<spirv::MergeOp>(block.front());`
	`258`	`+ return llvm::hasSingleElement(block) && isa<spirv::MergeOp>(block.front());`
`260`	`259`	`}`
`261`	`260`
`262`	`261`	/// Returns true if a `spirv.mlir.merge` op outside the merge block.