bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge add_handler into catch_switch

Browse source 
Some codegen backends may require all handlers to be immediately known
This commit is contained in:
bjorn3 2022-01-24 13:50:12 +01:00
parent e9646fa76b
commit 7a164509d3
5 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_codegen_llvm/src/intrinsic.rs
View file

@ -525,9 +525,8 @@ fn codegen_msvc_try<'ll>(
normal.ret(bx.const_i32(0));
let cs = catchswitch.catch_switch(None, None, 2);
catchswitch.add_handler(cs, catchpad_rust.llbb());
catchswitch.add_handler(cs, catchpad_foreign.llbb());
let cs =
catchswitch.catch_switch(None, None, &[catchpad_rust.llbb(), catchpad_foreign.llbb()]);
// We can't use the TypeDescriptor defined in libpanic_unwind because it
// might be in another DLL and the SEH encoding only supports specifying