4 files changed, 8 insertions, 8 deletions
diff --git a/mlir/lib/IR/Operation.cpp b/mlir/lib/IR/Operation.cpp
index 78cc18480cf..3d617b7d0e1 100644
--- a/mlir/lib/IR/Operation.cpp
+++ b/mlir/lib/IR/Operation.cpp
@@ -67,25 +67,25 @@ void OpState::print(OpAsmPrinter *p) { p->printGenericOp(getInstruction()); }
 /// any diagnostic handlers that may be listening.  NOTE: This may terminate
 /// the containing application, only use when the IR is in an inconsistent
 /// state.
-bool OpState::emitError(const Twine &message) const {
+bool OpState::emitError(const Twine &message) {
   return getInstruction()->emitError(message);
 }
 
 /// Emit an error with the op name prefixed, like "'dim' op " which is
 /// convenient for verifiers.
-bool OpState::emitOpError(const Twine &message) const {
+bool OpState::emitOpError(const Twine &message) {
   return getInstruction()->emitOpError(message);
 }
 
 /// Emit a warning about this operation, reporting up to any diagnostic
 /// handlers that may be listening.
-void OpState::emitWarning(const Twine &message) const {
+void OpState::emitWarning(const Twine &message) {
   getInstruction()->emitWarning(message);
 }
 
 /// Emit a note about this operation, reporting up to any diagnostic
 /// handlers that may be listening.
-void OpState::emitNote(const Twine &message) const {
+void OpState::emitNote(const Twine &message) {
   getInstruction()->emitNote(message);
 }
 
diff --git a/mlir/lib/StandardOps/Ops.cpp b/mlir/lib/StandardOps/Ops.cpp
index 963362871a2..ffa29b194af 100644
--- a/mlir/lib/StandardOps/Ops.cpp
+++ b/mlir/lib/StandardOps/Ops.cpp
@@ -898,7 +898,7 @@ Block *CondBranchOp::getFalseDest() {
   return getInstruction()->getSuccessor(falseIndex);
 }
 
-unsigned CondBranchOp::getNumTrueOperands() const {
+unsigned CondBranchOp::getNumTrueOperands() {
   return getInstruction()->getNumSuccessorOperands(trueIndex);
 }
 
@@ -906,7 +906,7 @@ void CondBranchOp::eraseTrueOperand(unsigned index) {
   getInstruction()->eraseSuccessorOperand(trueIndex, index);
 }
 
-unsigned CondBranchOp::getNumFalseOperands() const {
+unsigned CondBranchOp::getNumFalseOperands() {
   return getInstruction()->getNumSuccessorOperands(falseIndex);
 }
 
diff --git a/mlir/lib/Transforms/Utils/LoopUtils.cpp b/mlir/lib/Transforms/Utils/LoopUtils.cpp
index 61d9bcc044f..5a58c06dd42 100644
--- a/mlir/lib/Transforms/Utils/LoopUtils.cpp
+++ b/mlir/lib/Transforms/Utils/LoopUtils.cpp
@@ -135,7 +135,7 @@ LogicalResult mlir::promoteIfSingleIteration(OpPointer<AffineForOp> forOp) {
           forOp->getLoc(), forOp->getConstantLowerBound());
       iv->replaceAllUsesWith(constOp);
     } else {
-      const AffineBound lb = forOp->getLowerBound();
+      AffineBound lb = forOp->getLowerBound();
       SmallVector<Value *, 4> lbOperands(lb.operand_begin(), lb.operand_end());
       FuncBuilder builder(forInst->getBlock(), Block::iterator(forInst));
       if (lb.getMap() == builder.getDimIdentityMap()) {
diff --git a/mlir/lib/Transforms/Vectorize.cpp b/mlir/lib/Transforms/Vectorize.cpp
index 1834b2db0cf..195202a281f 100644
--- a/mlir/lib/Transforms/Vectorize.cpp
+++ b/mlir/lib/Transforms/Vectorize.cpp
@@ -944,7 +944,7 @@ vectorizeLoopsAndLoadsRecursively(NestedMatch oneMatch,
 /// element type.
 /// If `type` is not a valid vector type or if the scalar constant is not a
 /// valid vector element type, returns nullptr.
-static Value *vectorizeConstant(Instruction *inst, const ConstantOp &constant,
+static Value *vectorizeConstant(Instruction *inst, ConstantOp constant,
                                 Type type) {
   if (!type || !type.isa<VectorType>() ||
       !VectorType::isValidElementType(constant.getType())) {