diff --git a/mlir/include/mlir/IR/OpDefinition.h b/mlir/include/mlir/IR/OpDefinition.h
--- a/mlir/include/mlir/IR/OpDefinition.h
+++ b/mlir/include/mlir/IR/OpDefinition.h
@@ -104,28 +104,37 @@
   /// Return the operation that this refers to.
   Operation *getOperation() { return state; }
 
+  // clang-format off
+
   /// Return the dialect that this refers to.
+  [[deprecated("Use Operation:: instead (replace '.' with '->').")]]
   Dialect *getDialect() { return getOperation()->getDialect(); }
 
   /// Return the parent Region of this operation.
+  [[deprecated("Use Operation:: instead (replace '.' with '->').")]]
   Region *getParentRegion() { return getOperation()->getParentRegion(); }
 
   /// Returns the closest surrounding operation that contains this operation
   /// or nullptr if this is a top-level operation.
+  [[deprecated("Use Operation:: instead (replace '.' with '->').")]]
   Operation *getParentOp() { return getOperation()->getParentOp(); }
 
   /// Return the closest surrounding parent operation that is of type 'OpTy'.
   template <typename OpTy>
+  [[deprecated("Use Operation:: instead (replace '.' with '->').")]]
   OpTy getParentOfType() {
     return getOperation()->getParentOfType<OpTy>();
   }
 
   /// Returns the closest surrounding parent operation with trait `Trait`.
   template <template <typename T> class Trait>
+  [[deprecated("Use Operation:: instead (replace '.' with '->').")]]
   Operation *getParentWithTrait() {
     return getOperation()->getParentWithTrait<Trait>();
   }
 
+  // clang-format on
+
   /// Return the context this operation belongs to.
   MLIRContext *getContext() { return getOperation()->getContext(); }
 
@@ -152,37 +161,50 @@
   using dialect_attr_iterator = Operation::dialect_attr_iterator;
   using dialect_attr_range = Operation::dialect_attr_range;
 
+  // clang-format off
+
   /// Return a range corresponding to the dialect attributes for this operation.
+  [[deprecated("Use Operation::getDialectAttrs() instead.")]]
   dialect_attr_range getDialectAttrs() { return state->getDialectAttrs(); }
+  [[deprecated("Use Operation::dialect_attr_begin() instead.")]]
   dialect_attr_iterator dialect_attr_begin() {
     return state->dialect_attr_begin();
   }
+  [[deprecated("Use Operation::dialect_attr_end() instead.")]]
   dialect_attr_iterator dialect_attr_end() { return state->dialect_attr_end(); }
 
   /// Return an attribute with the specified name.
+  [[deprecated("Use Operation::getAttr() instead (replace '.' with '->').")]]
   Attribute getAttr(StringRef name) { return state->getAttr(name); }
 
   /// If the operation has an attribute of the specified type, return it.
   template <typename AttrClass>
+  [[deprecated("Use Operation::getAttrOfType() instead.")]]
   AttrClass getAttrOfType(StringRef name) {
     return getAttr(name).dyn_cast_or_null<AttrClass>();
   }
 
   /// If the an attribute exists with the specified name, change it to the new
   /// value.  Otherwise, add a new attribute with the specified name/value.
+  [[deprecated("Use Operation::setAttr() instead (replace '.' with '->').")]]
   void setAttr(Identifier name, Attribute value) {
     state->setAttr(name, value);
   }
+  [[deprecated("Use Operation::setAttr() instead (replace '.' with '->').")]]
   void setAttr(StringRef name, Attribute value) {
     setAttr(Identifier::get(name, getContext()), value);
   }
 
   /// Set the attributes held by this operation.
+  [[deprecated("Use Operation::setAttrs() instead (replace '.' with '->').")]]
   void setAttrs(ArrayRef<NamedAttribute> attributes) {
     state->setAttrs(DictionaryAttr::get(attributes, getContext()));
   }
+  [[deprecated("Use Operation::setAttrs() instead (replace '.' with '->').")]]
   void setAttrs(DictionaryAttr newAttrs) { state->setAttrs(newAttrs); }
 
+  // clang-format on
+
   /// Set the dialect attributes for this operation, and preserve all dependent.
   template <typename DialectAttrs>
   void setDialectAttrs(DialectAttrs &&attrs) {