Revert "[CIR] Add dedicated CIR op for setjmp (#1853)"

This reverts commit 4e092b2.

Author: bcardosolopes

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

@@ -4703,36 +4703,6 @@ def CIR_EhTypeIdOp : CIR_Op<"eh.typeid",
   }];
 }
 
-def CIR_EhSetjmp : CIR_Op<"eh.setjmp"> {
-  let summary = "CIR setjmp operation";
-  let description = [{
-    Saves call-site information (e.g., stack pointer, instruction
-    pointer, signal mask, and other registers) in memory at `env` for use by longjmp(). In this case,
-    setjmp() returns 0. Following a successful longjmp(), execution proceeds
-    from cir.eh.setjmp with the operation yielding a non-zero value.
-
-    The presence of the `builtin` attribute refers to the setjmp() function; the lack of the attribute refers
-    to the _setjmp() function.
-
-    Examples:
-    ```mlir
-      // Specify setjmp is builtin.
-      %0 = cir.eh.setjmp builtin %arg0 : (!cir.ptr<!cir.void>) -> !s32i
-
-      // Specify setjmp is not builtin.
-      %0 = cir.eh.setjmp %arg0 : (!cir.ptr<!cir.void>) -> !s32i
-    ```
-  }];
-  let arguments = (ins CIR_PointerType:$env, UnitAttr:$is_builtin);
-
-  let results = (outs CIR_SInt32:$res);
-
-  let assemblyFormat = [{
-      (`builtin` $is_builtin^)?
-      $env `:` functional-type($env, results) attr-dict
-  }];
-}
-
 //===----------------------------------------------------------------------===//
 // CopyOp
 //===----------------------------------------------------------------------===//

clang/lib/CIR/CodeGen/CIRGenBuiltin.cpp

@@ -1927,9 +1927,12 @@ RValue CIRGenFunction::emitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
     cir::PtrStrideOp stackSaveSlot = cir::PtrStrideOp::create(
         builder, loc, ppTy, castBuf, builder.getSInt32(2, loc));
     cir::StoreOp::create(builder, loc, stacksave, stackSaveSlot);
-    cir::EhSetjmp op =
-        cir::EhSetjmp::create(builder, loc, castBuf, /*is_builtin=*/true);
-    return RValue::get(op);
+    mlir::Value setjmpCall =
+        cir::LLVMIntrinsicCallOp::create(
+            builder, loc, builder.getStringAttr("eh.sjlj.setjmp"),
+            builder.getSInt32Ty(), mlir::ValueRange{castBuf})
+            .getResult();
+    return RValue::get(setjmpCall);
   }
   case Builtin::BI__builtin_longjmp:
     llvm_unreachable("BI__builtin_longjmp NYI");
@@ -2431,13 +2434,7 @@ RValue CIRGenFunction::emitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
         llvm_unreachable("NYI setjmp on aarch64");
       llvm_unreachable("NYI setjmp on generic MSVCRT");
     }
-    Address buf = emitPointerWithAlignment(E->getArg(0));
-    mlir::Location loc = getLoc(E->getExprLoc());
-    cir::PointerType ppTy = builder.getPointerTo(builder.getVoidPtrTy());
-    mlir::Value castBuf = builder.createBitcast(buf.getPointer(), ppTy);
-    cir::EhSetjmp op =
-        cir::EhSetjmp::create(builder, loc, castBuf, /*builtin = */ false);
-    return RValue::get(op);
+    break;
   }
 
   // C++ std:: builtins.

clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp

@@ -4287,28 +4287,6 @@ mlir::LogicalResult CIRToLLVMEhTypeIdOpLowering::matchAndRewrite(
   return mlir::success();
 }
 
-mlir::LogicalResult CIRToLLVMEhSetjmpOpLowering::matchAndRewrite(
-    cir::EhSetjmp op, OpAdaptor adaptor,
-    mlir::ConversionPatternRewriter &rewriter) const {
-  mlir::Type returnType = typeConverter->convertType(op.getType());
-  if (op.getIsBuiltin()) {
-    mlir::LLVM::CallIntrinsicOp newOp =
-        createCallLLVMIntrinsicOp(rewriter, op.getLoc(), "llvm.eh.sjlj.setjmp",
-                                  returnType, adaptor.getEnv());
-    rewriter.replaceOp(op, newOp);
-    return mlir::success();
-  }
-
-    StringRef fnName = "_setjmp";
-    auto llvmPtrTy = mlir::LLVM::LLVMPointerType::get(rewriter.getContext());
-    auto fnType = mlir::LLVM::LLVMFunctionType::get(returnType, llvmPtrTy,
-                                                    /*isVarArg=*/false);
-    getOrCreateLLVMFuncOp(rewriter, op, fnName, fnType);
-    rewriter.replaceOpWithNewOp<mlir::LLVM::CallOp>(op, returnType, fnName,
-                                                    adaptor.getEnv());
-    return mlir::success();
-}
-
 mlir::LogicalResult CIRToLLVMCatchParamOpLowering::matchAndRewrite(
     cir::CatchParamOp op, OpAdaptor adaptor,
     mlir::ConversionPatternRewriter &rewriter) const {
@@ -4552,7 +4530,6 @@ void populateCIRToLLVMConversionPatterns(
       CIRToLLVMDerivedClassAddrOpLowering,
       CIRToLLVMEhInflightOpLowering,
       CIRToLLVMEhTypeIdOpLowering,
-      CIRToLLVMEhSetjmpOpLowering,
       CIRToLLVMExpectOpLowering,
       CIRToLLVMExtractMemberOpLowering,
       CIRToLLVMFrameAddrOpLowering,

clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.h

@@ -1220,16 +1220,6 @@ class CIRToLLVMEhTypeIdOpLowering
                   mlir::ConversionPatternRewriter &) const override;
 };
 
-class CIRToLLVMEhSetjmpOpLowering
-    : public mlir::OpConversionPattern<cir::EhSetjmp> {
-public:
-  using mlir::OpConversionPattern<cir::EhSetjmp>::OpConversionPattern;
-
-  mlir::LogicalResult
-  matchAndRewrite(cir::EhSetjmp op, OpAdaptor,
-                  mlir::ConversionPatternRewriter &) const override;
-};
-
 class CIRToLLVMCatchParamOpLowering
     : public mlir::OpConversionPattern<cir::CatchParamOp> {
 public:

clang/test/CIR/CodeGen/builtin-setjmp-longjmp.c

@@ -5,6 +5,7 @@
 // RUN: %clang_cc1 -triple x86_64-unknown-linux -O2 -emit-llvm %s -o %t.ll
 // RUN: FileCheck --input-file=%t.ll %s -check-prefix=OGCG
 void test_setjmp(void *env) {
+
   // CIR-LABEL: test_setjmp
   // CIR-SAME: [[ENV:%.*]]: 
   // CIR-NEXT: [[ENV_ALLOCA:%[0-9]+]] = cir.alloca !cir.ptr<!void>, !cir.ptr<!cir.ptr<!void>>,
@@ -18,7 +19,7 @@ void test_setjmp(void *env) {
   // CIR-NEXT: [[TWO:%[0-9]+]] = cir.const #cir.int<2>
   // CIR-NEXT: [[GEP:%[0-9]+]] = cir.ptr_stride [[CAST]], [[TWO]] : (!cir.ptr<!cir.ptr<!void>>, !s32i) -> !cir.ptr<!cir.ptr<!void>>
   // CIR-NEXT: cir.store [[SS]], [[GEP]] : !cir.ptr<!void>, !cir.ptr<!cir.ptr<!void>>
-  // CIR-NEXT: [[SJ:%[0-9]+]] = cir.eh.setjmp builtin [[CAST]] : (!cir.ptr<!cir.ptr<!void>>) -> !s32i
+  // CIR-NEXT: [[SJ:%[0-9]+]] = cir.llvm.intrinsic "eh.sjlj.setjmp" [[CAST]]
 
 
   // LLVM-LABEL: test_setjmp
@@ -43,14 +44,14 @@ void test_setjmp(void *env) {
 
 extern int _setjmp(void *env);
 void test_setjmp2(void *env) {
+
   // CIR-LABEL: test_setjmp2
-  // CIR-SAME: [[ENV:%.*]]:
-  // CIR-NEXT: [[ENV_ALLOCA]] = cir.alloca
+  // CIR-SAME: [[ENV:%.*]]: !cir.ptr<!void>
+  // CIR-NEXT: [[ENV_ALLOCA:%.*]] = cir.alloca
   // CIR-NEXT: cir.store [[ENV]], [[ENV_ALLOCA]]
+  // CIR-NEXT: [[DEAD_GET_GLOBAL:%.*]] = cir.get_global @_setjmp
   // CIR-NEXT: [[ENV_LOAD:%.*]] = cir.load align(8) [[ENV_ALLOCA]]
-  // CIR-NEXT: [[CAST:%.*]] = cir.cast(bitcast, [[ENV_LOAD]]
-  // CIR-NEXT: cir.eh.setjmp [[CAST]] : (!cir.ptr<!cir.ptr<!void>>) -> !s32i
-
+  // CIR-NEXT: cir.call @_setjmp([[ENV_LOAD]])
 
   // LLVM-LABEL: test_setjmp2
   // LLVM-SAME: (ptr{{.*}}[[ENV:%.*]])