Support cleanup region in the parser/printer

Author: AmrDeveloper

clang/include/clang/CIR/Dialect/IR/CIROps.td

@@ -2958,6 +2958,8 @@ def CIR_CallOp : CIR_CallOpBase<"call", [NoRegionArguments]> {
   let arguments = commonArgs;
   let regions = (region AnyRegion:$cleanup);
 
+  let skipDefaultBuilders = 1;
+
   let builders = [
     OpBuilder<(ins "mlir::SymbolRefAttr":$callee, "mlir::Type":$resType,
                    "mlir::ValueRange":$operands), [{

clang/lib/CIR/Dialect/IR/CIRDialect.cpp

@@ -841,6 +841,16 @@ static mlir::ParseResult parseCallCommon(mlir::OpAsmParser &parser,
   if (parser.resolveOperands(ops, opsFnTy.getInputs(), opsLoc, result.operands))
     return mlir::failure();
 
+  // If exception is present and there are cleanups, this should be latest thing
+  // present (after all attributes, etc).
+  if (!hasDestinationBlocks) {
+    mlir::Region *cleanupRegion = result.addRegion();
+    if (parser.parseOptionalKeyword("cleanup").succeeded()) {
+      if (parser.parseRegion(*cleanupRegion))
+        return failure();
+    }
+  }
+
   return mlir::success();
 }
 
@@ -893,6 +903,14 @@ static void printCallCommon(mlir::Operation *op,
   printer << " : ";
   printer.printFunctionalType(op->getOperands().getTypes(),
                               op->getResultTypes());
+
+  // If exception is present and there are cleanups, this should be latest thing
+  // present (after all attributes, etc).
+  auto call = dyn_cast<cir::CallOp>(op);
+  if (call && !call.getCleanup().empty()) {
+    printer << " cleanup ";
+    printer.printRegion(call.getCleanup());
+  }
 }
 
 mlir::ParseResult cir::CallOp::parse(mlir::OpAsmParser &parser,

clang/test/CIR/IR/try-catch.cir

@@ -1,6 +1,7 @@
 // RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !u8i = !cir.int<u, 8>
+!s32i = !cir.int<s, 32>
 
 module {
 
@@ -103,4 +104,37 @@ cir.func @empty_try_block_with_catch_unwind_contains_resume() {
 // CHECK:   cir.return
 // CHECK: }
 
+
+cir.func private @function_with_cleanup() -> !s32i
+
+// CHECK: cir.func private @function_with_cleanup() -> !s32i
+
+cir.func @try_catch_with_call_that_has_cleanup() {
+  cir.scope {
+    cir.try {
+      cir.call @function_with_cleanup() : () -> !s32i cleanup {
+        cir.yield
+      }
+      cir.yield
+    } unwind {
+      cir.resume
+    }
+  }
+  cir.return
+}
+
+// CHECK: cir.func @try_catch_with_call_that_has_cleanup() {
+// CHECK:   cir.scope {
+// CHECK:     cir.try {
+// CHECK:       cir.call @function_with_cleanup() : () -> !s32i cleanup {
+// CHECK:         cir.yield
+// CHECK:       }
+// CHECK:       cir.yield
+// CHECK:     } unwind {
+// CHECK:       cir.resume
+// CHECK:     }
+// CHECK:   }
+// CHECK:   cir.return
+// CHECK: }
+
 }