use cir::ThrowOp

Author: bruteforceboy

clang/lib/CIR/CodeGen/CIRGenItaniumCXXABI.cpp

@@ -2261,14 +2261,12 @@ mlir::Value CIRGenItaniumCXXABI::getCXXDestructorImplicitParam(
 
 void CIRGenItaniumCXXABI::emitRethrow(CIRGenFunction &CGF, bool isNoReturn) {
   // void __cxa_rethrow();
-  cir::FuncType fTy =
-      CGF.getBuilder().getFuncType({}, CGF.getBuilder().getVoidTy());
-
-  auto fn = CGF.CGM.createRuntimeFunction(fTy, "__cxa_rethrow");
-  auto loc = fn.getLoc();
 
   if (isNoReturn) {
     auto &builder = CGF.getBuilder();
+    assert(CGF.currSrcLoc && "expected source location");
+    auto loc = *CGF.currSrcLoc;
+
     // The idea here is creating a separate block for the rethrow with an
     // `UnreachableOp` as the terminator. So, we branch from the current block
     // to the rethrow block and create a block for the remaining operations.
@@ -2277,12 +2275,16 @@ void CIRGenItaniumCXXABI::emitRethrow(CIRGenFunction &CGF, bool isNoReturn) {
     auto reg = currentBlock->getParent();
 
     if (currentBlock->empty()) {
-      builder.createTryCallOp(fn.getLoc(), fn, {});
+      builder.create<cir::ThrowOp>(loc, mlir::Value{},
+                                   mlir::FlatSymbolRefAttr{},
+                                   mlir::FlatSymbolRefAttr{});
       builder.create<cir::UnreachableOp>(loc);
     } else {
       auto rethrowBlock = builder.createBlock(reg);
       builder.setInsertionPointToStart(rethrowBlock);
-      builder.createTryCallOp(fn.getLoc(), fn, {});
+      builder.create<cir::ThrowOp>(loc, mlir::Value{},
+                                   mlir::FlatSymbolRefAttr{},
+                                   mlir::FlatSymbolRefAttr{});
       builder.create<cir::UnreachableOp>(loc);
 
       builder.setInsertionPointToEnd(currentBlock);
@@ -2293,7 +2295,7 @@ void CIRGenItaniumCXXABI::emitRethrow(CIRGenFunction &CGF, bool isNoReturn) {
     builder.setInsertionPointToEnd(remBlock);
     // This will be erased during codegen, it acts as a placeholder for the
     // operations to be inserted (if any)
-    builder.create<cir::ScopeOp>(fn.getLoc(), /*scopeBuilder=*/
+    builder.create<cir::ScopeOp>(loc, /*scopeBuilder=*/
                                  [&](mlir::OpBuilder &b, mlir::Location loc) {
                                    b.create<cir::YieldOp>(loc);
                                  });