[CIR] Refactor TryCallOp creation

clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h

@@ -504,6 +504,45 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
     return createCallOp(loc, callee, mlir::cir::VoidType(), operands,
                         extraFnAttr);
   }
+
+  mlir::cir::TryCallOp
+  createTryCallOp(mlir::Location loc, mlir::Value exception,
+                  mlir::SymbolRefAttr callee = mlir::SymbolRefAttr(),
+                  mlir::Type returnType = mlir::cir::VoidType(),
+                  mlir::ValueRange operands = mlir::ValueRange(),
+                  mlir::cir::ExtraFuncAttributesAttr extraFnAttr = {}) {
+    mlir::cir::TryCallOp tryCallOp = create<mlir::cir::TryCallOp>(
+        loc, callee, exception, returnType, operands);
+    if (extraFnAttr) {
+      tryCallOp->setAttr("extra_attrs", extraFnAttr);
+    } else {
+      mlir::NamedAttrList empty;
+      tryCallOp->setAttr("extra_attrs",
+                         mlir::cir::ExtraFuncAttributesAttr::get(
+                             getContext(), empty.getDictionary(getContext())));
+    }
+    return tryCallOp;
+  }
+
+  mlir::cir::TryCallOp
+  createTryCallOp(mlir::Location loc, mlir::cir::FuncOp callee,
+                  mlir::Value exception, mlir::ValueRange operands,
+                  mlir::cir::ExtraFuncAttributesAttr extraFnAttr = {}) {
+    return createTryCallOp(loc, exception, mlir::SymbolRefAttr::get(callee),
+                           callee.getFunctionType().getReturnType(), operands,
+                           extraFnAttr);
+  }
+
+  mlir::cir::TryCallOp createIndirectTryCallOp(mlir::Location loc,
+                                               mlir::Value ind_target,
+                                               mlir::Value exception,
+                                               mlir::cir::FuncType fn_type,
+                                               mlir::ValueRange operands) {
+    llvm::SmallVector<mlir::Value, 4> resOperands({ind_target});
+    resOperands.append(operands.begin(), operands.end());
+    return createTryCallOp(loc, exception, mlir::SymbolRefAttr(),
+                           fn_type.getReturnType(), resOperands);
+  }
 };
 
 } // namespace cir

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

@@ -2881,14 +2881,6 @@ def TryCallOp : CIR_CallOp<"try_call"> {
   let results = (outs Variadic<CIR_AnyType>);
 
   let builders = [
-    OpBuilder<(ins "FuncOp":$callee, "mlir::Value":$exception,
-                   CArg<"ValueRange", "{}">:$operands), [{
-      $_state.addOperands(ValueRange{exception});
-      $_state.addOperands(operands);
-      $_state.addAttribute("callee", SymbolRefAttr::get(callee));
-      if (!callee.getFunctionType().isVoid())
-        $_state.addTypes(callee.getFunctionType().getReturnType());
-    }]>,
     OpBuilder<(ins "Value":$ind_target, "mlir::Value":$exception,
                "FuncType":$fn_type,
                CArg<"ValueRange", "{}">:$operands), [{
@@ -2903,8 +2895,10 @@ def TryCallOp : CIR_CallOp<"try_call"> {
     [{
       $_state.addOperands(ValueRange{exception});
       $_state.addOperands(operands);
-      $_state.addAttribute("callee", callee);
-      $_state.addTypes(resType);
+      if (callee)
+        $_state.addAttribute("callee", callee);
+      if (resType && !isa<VoidType>(resType))
+        $_state.addTypes(resType);
     }]>];
 
     let hasVerifier = 1;

clang/lib/CIR/CodeGen/CIRGenCall.cpp

@@ -456,11 +456,11 @@ buildCallLikeOp(CIRGenFunction &CGF, mlir::Location callLoc,
 
     mlir::cir::TryCallOp tryCallOp;
     if (indirectFuncTy) {
-      tryCallOp = builder.create<mlir::cir::TryCallOp>(
+      tryCallOp = builder.createIndirectTryCallOp(
           callLoc, addr, indirectFuncVal, indirectFuncTy, CIRCallArgs);
     } else {
-      tryCallOp = builder.create<mlir::cir::TryCallOp>(callLoc, directFuncOp,
-                                                       addr, CIRCallArgs);
+      tryCallOp =
+          builder.createTryCallOp(callLoc, directFuncOp, addr, CIRCallArgs);
     }
     tryCallOp->setAttr("extra_attrs", extraFnAttrs);
     return tryCallOp;