1 files changed, 16 insertions, 16 deletions

diff --git a/mlir/lib/Transforms/DialectConversion.cpp b/mlir/lib/Transforms/DialectConversion.cpp
index 5f7fb7a68c9..3f202c2a95b 100644
--- a/mlir/lib/Transforms/DialectConversion.cpp
+++ b/mlir/lib/Transforms/DialectConversion.cpp
@@ -227,7 +227,7 @@ void ArgConverter::notifyOpRemoved(Operation *op) {
       // Drop all uses of the original arguments and delete the original block.
       Block *origBlock = it->second.origBlock;
       for (BlockArgument arg : origBlock->getArguments())
-        arg->dropAllUses();
+        arg.dropAllUses();
       conversionInfo.erase(it);
     }
   }
@@ -241,7 +241,7 @@ void ArgConverter::discardRewrites(Block *block) {
 
   // Drop all uses of the new block arguments and replace uses of the new block.
   for (int i = block->getNumArguments() - 1; i >= 0; --i)
-    block->getArgument(i)->dropAllUses();
+    block->getArgument(i).dropAllUses();
   block->replaceAllUsesWith(origBlock);
 
   // Move the operations back the original block and the delete the new block.
@@ -269,17 +269,17 @@ void ArgConverter::applyRewrites(ConversionValueMapping &mapping) {
         // replace all uses.
         auto argReplacementValue = mapping.lookupOrDefault(origArg);
         if (argReplacementValue != origArg) {
-          origArg->replaceAllUsesWith(argReplacementValue);
+          origArg.replaceAllUsesWith(argReplacementValue);
           continue;
         }
         // If there are any dangling uses then replace the argument with one
         // generated by the type converter. This is necessary as the cast must
         // persist in the IR after conversion.
-        if (!origArg->use_empty()) {
+        if (!origArg.use_empty()) {
           rewriter.setInsertionPointToStart(newBlock);
           auto *newOp = typeConverter->materializeConversion(
-              rewriter, origArg->getType(), llvm::None, loc);
-          origArg->replaceAllUsesWith(newOp->getResult(0));
+              rewriter, origArg.getType(), llvm::None, loc);
+          origArg.replaceAllUsesWith(newOp->getResult(0));
         }
         continue;
       }
@@ -290,7 +290,7 @@ void ArgConverter::applyRewrites(ConversionValueMapping &mapping) {
       // type are the same, otherwise it should force a conversion to be
       // materialized.
       if (argInfo->newArgSize == 1) {
-        origArg->replaceAllUsesWith(
+        origArg.replaceAllUsesWith(
             mapping.lookupOrDefault(newBlock->getArgument(argInfo->newArgIdx)));
         continue;
       }
@@ -300,13 +300,13 @@ void ArgConverter::applyRewrites(ConversionValueMapping &mapping) {
       assert(argInfo->newArgSize > 1 && castValue && "expected 1->N mapping");
 
       // If the argument is still used, replace it with the generated cast.
-      if (!origArg->use_empty())
-        origArg->replaceAllUsesWith(mapping.lookupOrDefault(castValue));
+      if (!origArg.use_empty())
+        origArg.replaceAllUsesWith(mapping.lookupOrDefault(castValue));
 
       // If all users of the cast were removed, we can drop it. Otherwise, keep
       // the operation alive and let the user handle any remaining usages.
-      if (castValue->use_empty())
-        castValue->getDefiningOp()->erase();
+      if (castValue.use_empty())
+        castValue.getDefiningOp()->erase();
     }
   }
 }
@@ -372,7 +372,7 @@ Block *ArgConverter::applySignatureConversion(
     // to pack the new values.
     auto replArgs = newArgs.slice(inputMap->inputNo, inputMap->size);
     Operation *cast = typeConverter->materializeConversion(
-        rewriter, origArg->getType(), replArgs, loc);
+        rewriter, origArg.getType(), replArgs, loc);
     assert(cast->getNumResults() == 1 &&
            cast->getNumOperands() == replArgs.size());
     mapping.map(origArg, cast->getResult(0));
@@ -709,7 +709,7 @@ void ConversionPatternRewriterImpl::applyRewrites() {
   for (auto &repl : replacements) {
     for (unsigned i = 0, e = repl.newValues.size(); i != e; ++i) {
       if (auto newValue = repl.newValues[i])
-        repl.op->getResult(i)->replaceAllUsesWith(
+        repl.op->getResult(i).replaceAllUsesWith(
             mapping.lookupOrDefault(newValue));
     }
 
@@ -863,8 +863,8 @@ Block *ConversionPatternRewriter::applySignatureConversion(
 
 void ConversionPatternRewriter::replaceUsesOfBlockArgument(BlockArgument from,
                                                            Value to) {
-  for (auto &u : from->getUses()) {
-    if (u.getOwner() == to->getDefiningOp())
+  for (auto &u : from.getUses()) {
+    if (u.getOwner() == to.getDefiningOp())
       continue;
     u.getOwner()->replaceUsesOfWith(from, to);
   }
@@ -1665,7 +1665,7 @@ auto TypeConverter::convertBlockSignature(Block *block)
     -> Optional<SignatureConversion> {
   SignatureConversion conversion(block->getNumArguments());
   for (unsigned i = 0, e = block->getNumArguments(); i != e; ++i)
-    if (failed(convertSignatureArg(i, block->getArgument(i)->getType(),
+    if (failed(convertSignatureArg(i, block->getArgument(i).getType(),
                                    conversion)))
       return llvm::None;
   return conversion;