Add try intrinsics
#2614
Add try intrinsics
#2614
Conversation
liushuyu
force-pushed
the
add-intrinsics-try
branch
2 times, most recently
from
39014a4 to
a55d157
Compare
|
You are also adding support for |
liushuyu
force-pushed
the
add-intrinsics-try
branch
from
a55d157 to
fd8a9a6
Compare
There was a problem hiding this comment.
this PR looks great to me, thank you @liushuyu! unfortunately I'm not super well versed in our backend so I'll let someone else review it before merging it :)
| tree normal_return_stmt | ||
| = Backend::return_statement (fndecl, integer_zero_node, BUILTINS_LOCATION); | ||
| tree error_return_stmt | ||
| = Backend::return_statement (fndecl, integer_one_node, BUILTINS_LOCATION); |
There was a problem hiding this comment.
did you find these values in the rustc source? could it be possible to add the link to the source here? :)
| tree eh_pointer | ||
| = build_call_expr (builtin_decl_explicit (BUILT_IN_EH_POINTER), 1, | ||
| integer_zero_node); | ||
| catch_call = Backend::call_expression (catch_fn, {user_data, eh_pointer}, | ||
| nullptr, BUILTINS_LOCATION); | ||
|
|
||
| tree catch_block = Backend::block (fndecl, enclosing_scope, {}, | ||
| UNDEF_LOCATION, UNDEF_LOCATION); | ||
| Backend::block_add_statements (catch_block, | ||
| std::vector<tree>{catch_call, | ||
| error_return_stmt}); | ||
| // TODO(liushuyu): eh_personality needs to be implemented as a runtime thing | ||
| auto eh_construct | ||
| = Backend::exception_handler_statement (try_block, catch_block, NULL_TREE, | ||
| BUILTINS_LOCATION); |
There was a problem hiding this comment.
this looks good to me, but I have no real idea of what the try intrinsic does or how it is implemented. I also wonder if this is how rustc_codegen_gcc handles it? @antoyo @GuillaumeGomez
There was a problem hiding this comment.
We do it here if you want to take a look.
There was a problem hiding this comment.
Our implementation of panics doesn't work correctly with optimizations enabled, though. Not sure why: I still need to investigate.
|
@liushuyu are you able to rebase this work i think we should merge this as a starting point. |
gcc/rust/ChangeLog: * backend/rust-compile-intrinsic.cc: add `try` intrinsic handler. * lang.opt: add `-frust-panic` option. * rust-lang.cc: enable exception handler code generation. * rust-session-manager.cc: add getter and setter for panic strategy option. * rust-session-manager.h: Likewise. Signed-off-by: Zixing Liu <[email protected]>
liushuyu
force-pushed
the
add-intrinsics-try
branch
from
fd8a9a6 to
873aaac
Compare
|
Rebased. I am terribly sorry for hanging this pull request for so long. Now that I work for a company, I no longer have large chunks of time to work on projects like this. I can, however, talk to the company to see if they could allocate some time slots for me to do that. |
gcc/rust/ChangeLog: * backend/rust-compile-intrinsic.cc: add the new `catch_unwind` variant of the `try` intrinsic: this variant can be seen on Rust 1.78+ and returns `()` instead of `i32`.
gcc/testsuite/ChangeLog: * rust/compile/try-catch-unwind-old.rs: add a test to test the older try intrinsics from plain old Rust to v1.78.0 * rust/compile/try-catch-unwind-new.rs: add a test to test the newer catch_unwind instrinsics since Rust v1.78.0
liushuyu
force-pushed
the
add-intrinsics-try
branch
from
f31c5c9 to
ff72c51
Compare
|
Hi @philberty @CohenArthur: I have also added two unit tests for testing the code generation; since the fine people in the |
This pull request adds the
tryintrinsic, making it possible to handlepanics.A new option,
-frust-panicis added to specify the panic handling strategy.Note that currently, only
try-catchmechanism is added in this pull request.To correctly handle the
panicstructures, an unwinder must also be implemented (in the runtime library).