Address code review comments

Author: AmrDeveloper

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

@@ -2860,9 +2860,10 @@ def CIR_TryCallOp : CIR_CallOpBase<"try_call",[
 ]> {
   let summary = "try_call operation";
   let description = [{
-    Mostly similar to `cir.call` but requires two destination
-    branches, one for follow on regular control-flow, and the other
-    one for handling exceptions in case it's thrown.
+    Similar to `cir.call` but requires two destination blocks,
+    one which is used if the call returns without throwing an
+    exception (the "normal" destination) and another which is used
+    if an exception is thrown (the "unwind" destination). 
 
     This operation is used only after the CFG flatterning pass.
 

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

@@ -827,9 +827,8 @@ static void printCallCommon(mlir::Operation *op,
   printer << "(" << ops << ")";
 
   if (normalDest) {
-    assert(landingPad && "expected two successors");
-    auto tryCall = dyn_cast<cir::TryCallOp>(op);
-    assert(tryCall && "regular calls do not branch");
+    assert(unwindDest && "expected two successors");
+    auto tryCall = cast<cir::TryCallOp>(op);
     printer << ' ' << tryCall.getNormalDest();
     printer << ",";
     printer << ' ';
@@ -850,7 +849,6 @@ static void printCallCommon(mlir::Operation *op,
       CIRDialect::getSideEffectAttrName(),
       CIRDialect::getOperandSegmentSizesAttrName()};
   printer.printOptionalAttrDict(op->getAttrs(), elidedAttrs);
-
   printer << " : ";
   printer.printFunctionalType(op->getOperands().getTypes(),
                               op->getResultTypes());

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

@@ -9,22 +9,26 @@ cir.func private @division(%a: !s32i, %b: !s32i) -> !s32i
 cir.func @flatten_structure_with_try_call_op() {
    %a = cir.const #cir.int<1> : !s32i
    %b = cir.const #cir.int<2> : !s32i
-   %3 = cir.try_call @division(%a, %b) ^continue, ^landing_pad : (!s32i, !s32i) -> !s32i
- ^continue:
-   cir.br ^landing_pad
- ^landing_pad:
+   %3 = cir.try_call @division(%a, %b) ^normal, ^unwind : (!s32i, !s32i) -> !s32i
+ ^normal:
+   cir.br ^end
+ ^unwind:
+   cir.br ^end
+ ^end:
    cir.return
 }
 
 // CHECK: cir.func private @division(!s32i, !s32i) -> !s32i
 
 // CHECK: cir.func @flatten_structure_with_try_call_op() {
-// CHECK-NEXT:   %[[CONST_0:.*]] = cir.const #cir.int<1> : !s32i
-// CHECK-NEXT:   %[[CONST_1:.*]] = cir.const #cir.int<2> : !s32i
-// CHECK-NEXT:   %[[CALL:.*]] = cir.try_call @division(%0, %1) ^[[CONTINUE:.*]], ^[[LANDING_PAD:.*]] : (!s32i, !s32i) -> !s32i
-// CHECK-NEXT: ^[[CONTINUE]]:
-// CHECK-NEXT:   cir.br ^[[LANDING_PAD]]
-// CHECK-NEXT: ^[[LANDING_PAD]]:
+// CHECK-NEXT:   %[[CONST_1:.*]] = cir.const #cir.int<1> : !s32i
+// CHECK-NEXT:   %[[CONST_2:.*]] = cir.const #cir.int<2> : !s32i
+// CHECK-NEXT:   %[[CALL:.*]] = cir.try_call @division(%[[CONST_1]], %[[CONST_2]]) ^[[NORMAL:.*]], ^[[UNWIND:.*]] : (!s32i, !s32i) -> !s32i
+// CHECK-NEXT: ^[[normal]]:
+// CHECK-NEXT:   cir.br ^[[END:.*]]
+// CHECK-NEXT: ^[[unwind]]:
+// CHECK-NEXT:   cir.br ^[[END:.*]]
+// CHECK-NEXT: ^[[END]]:
 // CHECK-NEXT:   cir.return
 // CHECK-NEXT: }