1 files changed, 4 insertions, 34 deletions

diff --git a/mlir/lib/IR/AsmPrinter.cpp b/mlir/lib/IR/AsmPrinter.cpp
index 21bc3b824b1..cb4c1f0edce 100644
--- a/mlir/lib/IR/AsmPrinter.cpp
+++ b/mlir/lib/IR/AsmPrinter.cpp
@@ -145,7 +145,6 @@ private:
   // Visit functions.
   void visitInstruction(const Instruction *inst);
   void visitForInst(const ForInst *forInst);
-  void visitIfInst(const IfInst *ifInst);
   void visitOperationInst(const OperationInst *opInst);
   void visitType(Type type);
   void visitAttribute(Attribute attr);
@@ -197,10 +196,6 @@ void ModuleState::visitAttribute(Attribute attr) {
   }
 }
 
-void ModuleState::visitIfInst(const IfInst *ifInst) {
-  recordIntegerSetReference(ifInst->getIntegerSet());
-}
-
 void ModuleState::visitForInst(const ForInst *forInst) {
   AffineMap lbMap = forInst->getLowerBoundMap();
   if (!hasCustomForm(lbMap))
@@ -225,8 +220,6 @@ void ModuleState::visitOperationInst(const OperationInst *op) {
 
 void ModuleState::visitInstruction(const Instruction *inst) {
   switch (inst->getKind()) {
-  case Instruction::Kind::If:
-    return visitIfInst(cast<IfInst>(inst));
   case Instruction::Kind::For:
     return visitForInst(cast<ForInst>(inst));
   case Instruction::Kind::OperationInst:
@@ -1077,7 +1070,6 @@ public:
   void print(const Instruction *inst);
   void print(const OperationInst *inst);
   void print(const ForInst *inst);
-  void print(const IfInst *inst);
   void print(const Block *block, bool printBlockArgs = true);
 
   void printOperation(const OperationInst *op);
@@ -1125,6 +1117,9 @@ public:
                                 unsigned index) override;
 
   /// Print a block list.
+  void printBlockList(const BlockList &blocks) override {
+    printBlockList(blocks, /*printEntryBlockArgs=*/true);
+  }
   void printBlockList(const BlockList &blocks, bool printEntryBlockArgs) {
     os << " {\n";
     if (!blocks.empty()) {
@@ -1214,12 +1209,6 @@ void FunctionPrinter::numberValuesInBlock(const Block &block) {
       // Recursively number the stuff in the body.
       numberValuesInBlock(*cast<ForInst>(&inst)->getBody());
       break;
-    case Instruction::Kind::If: {
-      auto *ifInst = cast<IfInst>(&inst);
-      numberValuesInBlock(*ifInst->getThen());
-      if (auto *elseBlock = ifInst->getElse())
-        numberValuesInBlock(*elseBlock);
-    }
     }
   }
 }
@@ -1360,8 +1349,7 @@ void FunctionPrinter::printFunctionSignature() {
 }
 
 void FunctionPrinter::print(const Block *block, bool printBlockArgs) {
-  // Print the block label and argument list, unless this is the first block of
-  // the function, or the first block of an IfInst/ForInst with no arguments.
+  // Print the block label and argument list if requested.
   if (printBlockArgs) {
     os.indent(currentIndent);
     printBlockName(block);
@@ -1418,8 +1406,6 @@ void FunctionPrinter::print(const Instruction *inst) {
     return print(cast<OperationInst>(inst));
   case Instruction::Kind::For:
     return print(cast<ForInst>(inst));
-  case Instruction::Kind::If:
-    return print(cast<IfInst>(inst));
   }
 }
 
@@ -1447,22 +1433,6 @@ void FunctionPrinter::print(const ForInst *inst) {
   os.indent(currentIndent) << "}";
 }
 
-void FunctionPrinter::print(const IfInst *inst) {
-  os.indent(currentIndent) << "if ";
-  IntegerSet set = inst->getIntegerSet();
-  printIntegerSetReference(set);
-  printDimAndSymbolList(inst->getInstOperands(), set.getNumDims());
-  printTrailingLocation(inst->getLoc());
-  os << " {\n";
-  print(inst->getThen(), /*printBlockArgs=*/false);
-  os.indent(currentIndent) << "}";
-  if (inst->hasElse()) {
-    os << " else {\n";
-    print(inst->getElse(), /*printBlockArgs=*/false);
-    os.indent(currentIndent) << "}";
-  }
-}
-
 void FunctionPrinter::printValueID(const Value *value,
                                    bool printResultNo) const {
   int resultNo = -1;