Skip to content

Conversation

@kazutakahirata
Copy link
Contributor

No description provided.

@llvmbot
Copy link
Member

llvmbot commented May 18, 2025

@llvm/pr-subscribers-mlir-emitc
@llvm/pr-subscribers-mlir

@llvm/pr-subscribers-mlir-affine

Author: Kazu Hirata (kazutakahirata)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/140467.diff

2 Files Affected:

  • (modified) mlir/lib/Conversion/MemRefToEmitC/MemRefToEmitC.cpp (+1-2)
  • (modified) mlir/lib/Dialect/Affine/IR/AffineOps.cpp (+1-2)
diff --git a/mlir/lib/Conversion/MemRefToEmitC/MemRefToEmitC.cpp b/mlir/lib/Conversion/MemRefToEmitC/MemRefToEmitC.cpp
index c69890a10d61e..db244d1d1cac8 100644
--- a/mlir/lib/Conversion/MemRefToEmitC/MemRefToEmitC.cpp
+++ b/mlir/lib/Conversion/MemRefToEmitC/MemRefToEmitC.cpp
@@ -195,8 +195,7 @@ void mlir::populateMemRefToEmitCTypeConversion(TypeConverter &typeConverter) {
       [&](MemRefType memRefType) -> std::optional<Type> {
         if (!memRefType.hasStaticShape() ||
             !memRefType.getLayout().isIdentity() || memRefType.getRank() == 0 ||
-            llvm::any_of(memRefType.getShape(),
-                         [](int64_t dim) { return dim == 0; })) {
+            llvm::is_contained(memRefType.getShape(), 0)) {
           return {};
         }
         Type convertedElementType =
diff --git a/mlir/lib/Dialect/Affine/IR/AffineOps.cpp b/mlir/lib/Dialect/Affine/IR/AffineOps.cpp
index 9cb06e014f843..4ba24c66e3b82 100644
--- a/mlir/lib/Dialect/Affine/IR/AffineOps.cpp
+++ b/mlir/lib/Dialect/Affine/IR/AffineOps.cpp
@@ -5045,8 +5045,7 @@ OpFoldResult AffineLinearizeIndexOp::fold(FoldAdaptor adaptor) {
   if (getMultiIndex().size() == 1)
     return getMultiIndex().front();
 
-  if (llvm::any_of(adaptor.getMultiIndex(),
-                   [](Attribute a) { return a == nullptr; }))
+  if (llvm::is_contained(adaptor.getMultiIndex(), nullptr))
     return nullptr;
 
   if (!adaptor.getDynamicBasis().empty())

@kazutakahirata kazutakahirata merged commit 52ca511 into llvm:main May 19, 2025
15 checks passed
@kazutakahirata kazutakahirata deleted the cleanup_001_range_llvm_is_contained_mlir branch May 19, 2025 13:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants