llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clangir @llvm/pr-subscribers-clang Author: Amr Hesham (AmrDeveloper) <details> <summary>Changes</summary> Add SCF Resume op to be used before the CFG flattening pass Issue https://github.com/llvm/llvm-project/issues/154992 --- Full diff: https://github.com/llvm/llvm-project/pull/170042.diff 2 Files Affected: - (modified) clang/include/clang/CIR/Dialect/IR/CIROps.td (+30) - (modified) clang/test/CIR/IR/try-catch.cir (+22) ``````````diff diff --git a/clang/include/clang/CIR/Dialect/IR/CIROps.td b/clang/include/clang/CIR/Dialect/IR/CIROps.td index 5f5fab6f12300..0a8c06861a18b 100644 --- a/clang/include/clang/CIR/Dialect/IR/CIROps.td +++ b/clang/include/clang/CIR/Dialect/IR/CIROps.td @@ -898,6 +898,36 @@ def CIR_ContinueOp : CIR_Op<"continue", [Terminator]> { let hasLLVMLowering = false; } +//===----------------------------------------------------------------------===// +// Resume +//===----------------------------------------------------------------------===// + +def CIR_SCFResumeOp : CIR_Op<"scf.resume", [ + ReturnLike, Terminator +]> { + let summary = "Resumes execution after not catching exceptions"; + let description = [{ + The `cir.scf.resume` operation handles an uncaught exception scenario. + + Used as the terminator of a `CatchUnwind` region of `cir.try`, where it + does not receive any arguments (implied from the `cir.try` scope). + + This operation is used only before the CFG flatterning pass. + + Examples: + ```mlir + cir.try { + cir.yield + } unwind { + cir.scf.resume + } + ``` + }]; + + let assemblyFormat = "attr-dict"; + let hasLLVMLowering = false; +} + //===----------------------------------------------------------------------===// // ScopeOp //===----------------------------------------------------------------------===// diff --git a/clang/test/CIR/IR/try-catch.cir b/clang/test/CIR/IR/try-catch.cir index 7becd0b559f5e..44263345caee3 100644 --- a/clang/test/CIR/IR/try-catch.cir +++ b/clang/test/CIR/IR/try-catch.cir @@ -81,4 +81,26 @@ cir.func dso_local @empty_try_block_with_catch_ist() { // CHECK: cir.return // CHECK: } +cir.func dso_local @empty_try_block_with_catch_unwind_contains_resume() { + cir.scope { + cir.try { + cir.yield + } unwind { + cir.scf.resume + } + } + cir.return +} + +// CHECK: cir.func dso_local @empty_try_block_with_catch_unwind_contains_resume() { +// CHECK: cir.scope { +// CHECK: cir.try { +// CHECK: cir.yield +// CHECK: } unwind { +// CHECK: cir.scf.resume +// CHECK: } +// CHECK: } +// CHECK: cir.return +// CHECK: } + } `````````` </details> https://github.com/llvm/llvm-project/pull/170042 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
