[PATCH] D76603: [MLIR] Refactor builder of `loop.if` op with support of non-void ops.

[Alexander Belyaev via Phabricator via llvm-commits]

pifon2a updated this revision to Diff 252128.
pifon2a added a comment.

Resolve merge conflicts.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D76603/new/

https://reviews.llvm.org/D76603

Files:
  mlir/include/mlir/Dialect/LoopOps/LoopOps.td
  mlir/lib/Dialect/LoopOps/LoopOps.cpp


Index: mlir/lib/Dialect/LoopOps/LoopOps.cpp
===================================================================
--- mlir/lib/Dialect/LoopOps/LoopOps.cpp
+++ mlir/lib/Dialect/LoopOps/LoopOps.cpp
@@ -200,19 +200,21 @@
 //===----------------------------------------------------------------------===//
 
 void IfOp::build(Builder *builder, OperationState &result, Value cond,
-                 bool withElseRegion) {
-  build(builder, result, /*resultTypes=*/llvm::None, cond, withElseRegion);
-}
-
-void IfOp::build(Builder *builder, OperationState &result,
-                 TypeRange resultTypes, Value cond, bool withElseRegion) {
+                 bool withElseRegion, ArrayRef<Type> resultTypes) {
   result.addOperands(cond);
   result.addTypes(resultTypes);
+
   Region *thenRegion = result.addRegion();
-  Region *elseRegion = result.addRegion();
-  IfOp::ensureTerminator(*thenRegion, *builder, result.location);
-  if (withElseRegion)
-    IfOp::ensureTerminator(*elseRegion, *builder, result.location);
+  thenRegion->push_back(new Block());
+  if (resultTypes.empty())
+    IfOp::ensureTerminator(*thenRegion, *builder, result.location);
+
+  if (withElseRegion) {
+    Region *elseRegion = result.addRegion();
+    elseRegion->push_back(new Block());
+    if (resultTypes.empty())
+      IfOp::ensureTerminator(*elseRegion, *builder, result.location);
+  }
 }
 
 static LogicalResult verify(IfOp op) {
Index: mlir/include/mlir/Dialect/LoopOps/LoopOps.td
===================================================================
--- mlir/include/mlir/Dialect/LoopOps/LoopOps.td
+++ mlir/include/mlir/Dialect/LoopOps/LoopOps.td
@@ -220,23 +220,22 @@
 
   let skipDefaultBuilders = 1;
   let builders = [
-    OpBuilder<"Builder *builder, OperationState &result, "
-              "Value cond, bool withElseRegion">,
-    OpBuilder<"Builder *builder, OperationState &result, "
-              "TypeRange resultTypes, Value cond, "
-              "bool withElseRegion">
+    OpBuilder<"Builder *builder, OperationState &result, Value cond, "
+              "bool withElseRegion, ArrayRef<Type> resultTypes = {}">
   ];
 
   let extraClassDeclaration = [{
     OpBuilder getThenBodyBuilder() {
       assert(!thenRegion().empty() && "Unexpected empty 'then' region.");
       Block &body = thenRegion().front();
-      return OpBuilder(&body, std::prev(body.end()));
+      return OpBuilder(&body,
+                       results().empty() ? body.end() : std::prev(body.end()));
     }
     OpBuilder getElseBodyBuilder() {
       assert(!elseRegion().empty() && "Unexpected empty 'else' region.");
       Block &body = elseRegion().front();
-      return OpBuilder(&body, std::prev(body.end()));
+      return OpBuilder(&body,
+                       results().empty() ? body.end() : std::prev(body.end()));
     }
   }];
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D76603.252128.patch
Type: text/x-patch
Size: 2823 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200323/cd114350/attachment.bin>