Address code review comments

Author: AmrDeveloper

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

@@ -4525,7 +4525,7 @@ def CIR_CatchParamOp : CIR_Op<"catch_param"> {
   let assemblyFormat = [{
     ($kind^)?
     ($exception_ptr^)?
-    (`->` qualified(type($param))^)?
+    (`:` qualified(type($param))^)?
     attr-dict
   }];
 

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

@@ -3104,12 +3104,12 @@ LogicalResult cir::CatchParamOp::verify() {
   std::optional<cir::CatchParamKind> kind = getKind();
   if (getExceptionPtr()) {
     if (!kind || *kind != cir::CatchParamKind::Begin)
-      return emitOpError("needs 'begin' to work with exception pointer");
+      return emitOpError("with exception pointer must be of `begin` kind");
     return success();
   }
 
   if (!kind && !(*this)->getParentOfType<cir::TryOp>())
-    return emitOpError("without 'kind' requires 'cir.try' surrounding scope");
+    return emitOpError("without `kind` requires `cir.try` surrounding scope");
   return success();
 }
 

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

@@ -10,7 +10,7 @@ cir.func dso_local @catch_param_inside_catch() {
     cir.try {
       cir.yield
     } catch all {
-      cir.catch_param -> !cir.ptr<!void> 
+      cir.catch_param : !cir.ptr<!void> 
       cir.yield
     }
   }
@@ -22,7 +22,7 @@ cir.func dso_local @catch_param_inside_catch() {
 // CHECK:     cir.try {
 // CHECK:       cir.yield
 // CHECK:     } catch all {
-// CHECK:       cir.catch_param -> !cir.ptr<!void> 
+// CHECK:       cir.catch_param : !cir.ptr<!void> 
 // CHECK:       cir.yield
 // CHECK:     }
 // CHECK:   }
@@ -34,20 +34,19 @@ cir.func dso_local @catch_begin_and_end() {
     %tmp_exn_ptr = cir.load %exn_addr : !cir.ptr<!cir.ptr<!void>>, !cir.ptr<!void>
     cir.br ^bb1(%tmp_exn_ptr : !cir.ptr<!void>)
   ^bb1(%exn_ptr : !cir.ptr<!void>):
-    %begin = cir.catch_param begin %exn_ptr -> !cir.ptr<!s32i>
+    %begin = cir.catch_param begin %exn_ptr : !cir.ptr<!s32i>
     cir.catch_param end
     cir.br ^bb2
   ^bb2:
     cir.return
 }
 
-
 // CHECK: cir.func dso_local @catch_begin_and_end() {
 // CHECK:   %[[EXN_ADDR:.*]] = cir.alloca !cir.ptr<!void>, !cir.ptr<!cir.ptr<!void>>, ["exn_addr"]
 // CHECK:   %[[TMP_EXN_PTR:.*]] = cir.load %[[EXN_ADDR]] : !cir.ptr<!cir.ptr<!void>>, !cir.ptr<!void>
 // CHECK:   cir.br ^bb1(%[[TMP_EXN_PTR]] : !cir.ptr<!void>)
 // CHECK: ^bb1(%[[EXN_PTR:.*]]: !cir.ptr<!void>):
-// CHECK:   %[[BEGIN:.*]] = cir.catch_param begin %[[EXN_PTR]] -> !cir.ptr<!s32i>
+// CHECK:   %[[BEGIN:.*]] = cir.catch_param begin %[[EXN_PTR]] : !cir.ptr<!s32i>
 // CHECK:   cir.catch_param end
 // CHECK:   cir.br ^bb2
 // CHECK: ^bb2:

clang/test/CIR/IR/invalid-catch-param.cir

@@ -6,8 +6,8 @@
 module {
 
 cir.func dso_local @catch_param_without_kind_and_without_try_scope() {
-  // expected-error @below {{'cir.catch_param' op without 'kind' requires 'cir.try' surrounding scope}}
-  %0 = cir.catch_param -> !cir.ptr<!void>
+  // expected-error @below {{op without `kind` requires `cir.try` surrounding scope}}
+  %0 = cir.catch_param : !cir.ptr<!void>
   cir.return
 }
 
@@ -28,8 +28,8 @@ cir.func dso_local @catch_param_with_exception_ptr_but_without_kind() {
       cir.yield
     } catch all {
       %0 = cir.const #cir.ptr<null> : !cir.ptr<!void>
-      // expected-error @below {{'cir.catch_param' op needs 'begin' to work with exception pointer}}
-      %1 = cir.catch_param %0 -> !cir.ptr<!void>
+      // expected-error @below {{op with exception pointer must be of `begin` kind}}
+      %1 = cir.catch_param %0 : !cir.ptr<!void>
       cir.yield
     }
   }
@@ -53,8 +53,8 @@ cir.func dso_local @catch_param_with_exception_ptr_but_with_end_kind() {
       cir.yield
     } catch all {
       %0 = cir.const #cir.ptr<null> : !cir.ptr<!void>
-      // expected-error @below {{'cir.catch_param' op needs 'begin' to work with exception pointer}}
-      %1 = cir.catch_param end %0 -> !cir.ptr<!void>
+      // expected-error @below {{'cir.catch_param' op with exception pointer must be of `begin` kind}}
+      %1 = cir.catch_param end %0 : !cir.ptr<!void>
       cir.yield
     }
   }