[mlir][mem2reg] Follow-up adjustments (NFC).

[Moxinilian]

Summary

Ajustments to the MLIR mem2reg changes.

[gysit]

LGTM

[kuhar]

Thank you

mlir/lib/Transforms/Mem2Reg.cpp

 };
 
 } // namespace
 
 SlotPromoter::SlotPromoter(MemorySlot slot,
                            PromotableAllocationOpInterface allocator,
                            OpBuilder &builder, DominanceInfo &dominance)
     : slot(slot), allocator(allocator), builder(builder), dominance(dominance) {
-  bool isResultOrNewBlockArgument = slot.ptr.getDefiningOp() == allocator;
+#ifndef NDEBUG
+  auto isResultOrNewBlockArgument = [&]() {
     if (BlockArgument arg = slot.ptr.dyn_cast<BlockArgument>())
-    isResultOrNewBlockArgument = isResultOrNewBlockArgument ||
-                                 arg.getOwner()->getParentOp() == allocator;
-  (void)isResultOrNewBlockArgument;
-  assert(isResultOrNewBlockArgument &&
+      return arg.getOwner()->getParentOp() == allocator;
+    return slot.ptr.getDefiningOp() == allocator;
+  };
+
+  assert(isResultOrNewBlockArgument() &&
          "a slot must be a result of the allocator or an argument of the child "
          "regions of the allocator");
+#endif // NDEBUG
 }
 
 Value SlotPromoter::getLazyDefaultValue() {
   if (defaultValue)
     return defaultValue;
 
   OpBuilder::InsertionGuard guard(builder);
   builder.setInsertionPointToStart(slot.ptr.getParentBlock());
for (Operation *user : forwardSlice) {
     } else {
       // An operation that has blocking uses must be promoted. If it is not
       // promotable, promotion must fail.
       return failure();
     }
 
     // Then, register any new blocking uses for coming operations.
     for (OpOperand *blockingUse : newBlockingUses) {
-      assert(llvm::find(user->getResults(), blockingUse->get()) !=
-             user->result_end());
+      assert(llvm::is_contained(user->getResults(), blockingUse->get()));
 
       SmallPtrSetImpl<OpOperand *> &newUserBlockingUseSet =
           userToBlockingUses.getOrInsertDefault(blockingUse->getOwner());
       newUserBlockingUseSet.insert(blockingUse);
     }
   }
 
   // Because this pass currently only supports analysing the parent region of