From e9ac7927483ce2e2d92eb188c20332a1049bb69e Mon Sep 17 00:00:00 2001
From: Alexander Belyaev <pifon@google.com>
Date: Thu, 11 Jun 2020 19:22:48 +0200
Subject: [PATCH] [mlir] Fix some of the warnings in MLIR code.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Summary:
* extra ';' in the following files:
    mlir/lib/Dialect/Linalg/Transforms/Transforms.cpp
    mlir/lib/Dialect/Shape/IR/Shape.cpp

* base class ‘mlir::ConvertVectorToSCFBase<ConvertVectorToSCFPass>’
  should be explicitly initialized in the copy constructor [-Wextra] in
    mlir/lib/Conversion/VectorToSCF/VectorToSCF.cpp

* warning: ‘bool Expression::operator==(const Expression&) const’
  defined but not used [-Wunused-function] in
    mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-gen.cpp

Differential Revision: https://reviews.llvm.org/D81673
---
 mlir/lib/Conversion/VectorToSCF/VectorToSCF.cpp        |  1 -
 mlir/lib/Dialect/Linalg/Transforms/Transforms.cpp      |  2 +-
 mlir/lib/Dialect/Shape/IR/Shape.cpp                    |  2 +-
 mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-gen.cpp | 17 +----------------
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/mlir/lib/Conversion/VectorToSCF/VectorToSCF.cpp b/mlir/lib/Conversion/VectorToSCF/VectorToSCF.cpp
index 329b008..f7bdd53 100644
--- a/mlir/lib/Conversion/VectorToSCF/VectorToSCF.cpp
+++ b/mlir/lib/Conversion/VectorToSCF/VectorToSCF.cpp
@@ -651,7 +651,6 @@ namespace {
 struct ConvertVectorToSCFPass
     : public ConvertVectorToSCFBase<ConvertVectorToSCFPass> {
   ConvertVectorToSCFPass() = default;
-  ConvertVectorToSCFPass(const ConvertVectorToSCFPass &pass) {}
   ConvertVectorToSCFPass(const VectorTransferToSCFOptions &options) {
     this->fullUnroll = options.unroll;
   }
diff --git a/mlir/lib/Dialect/Linalg/Transforms/Transforms.cpp b/mlir/lib/Dialect/Linalg/Transforms/Transforms.cpp
index f46d08f..402200f 100644
--- a/mlir/lib/Dialect/Linalg/Transforms/Transforms.cpp
+++ b/mlir/lib/Dialect/Linalg/Transforms/Transforms.cpp
@@ -101,7 +101,7 @@ mlir::linalg::LinalgTilingOptions::setTileSizes(ArrayRef<int64_t> ts) {
     }));
   };
   return *this;
-};
+}
 
 /// Linalg base tiling pattern.
 mlir::linalg::LinalgBaseTilingPattern::LinalgBaseTilingPattern(
diff --git a/mlir/lib/Dialect/Shape/IR/Shape.cpp b/mlir/lib/Dialect/Shape/IR/Shape.cpp
index 0791327..4a876e1 100644
--- a/mlir/lib/Dialect/Shape/IR/Shape.cpp
+++ b/mlir/lib/Dialect/Shape/IR/Shape.cpp
@@ -187,7 +187,7 @@ struct AssumingWithTrue : public OpRewritePattern<AssumingOp> {
     return success();
   }
 };
-}; // namespace
+} // namespace
 
 void AssumingOp::getCanonicalizationPatterns(OwningRewritePatternList &patterns,
                                              MLIRContext *context) {
diff --git a/mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-gen.cpp b/mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-gen.cpp
index d2dd1f5..c417995 100644
--- a/mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-gen.cpp
+++ b/mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-gen.cpp
@@ -846,9 +846,8 @@ struct Expression {
   };
 
   explicit Expression(Kind k = Kind::Uninitialized) : kind(k) {}
-  virtual ~Expression() = 0;
+  virtual ~Expression() = default;
 
-  bool operator==(const Expression &e) const;
   operator bool() const { return kind != Kind::Uninitialized; }
 
   Kind kind;
@@ -930,20 +929,6 @@ struct TensorExpr : public Expression {
   SetVector<unsigned> reductionDimensions;
 };
 
-Expression::~Expression() {}
-
-bool Expression::operator==(const Expression &e) const {
-  if (this->kind != e.kind)
-    return false;
-  if (e.kind == Expression::Kind::TensorUse)
-    return static_cast<const TensorUse &>(*this) ==
-           static_cast<const TensorUse &>(e);
-  if (e.kind == Expression::Kind::TensorExpr)
-    return static_cast<const TensorExpr &>(*this) ==
-           static_cast<const TensorExpr &>(e);
-  llvm_unreachable("Unexpected case");
-}
-
 /// This is a specialized parser for a TCDef.
 /// This maintains the dims it finds in an eager fashion.
 class TCParser {
-- 
2.7.4