diff options
| author | bors <bors@rust-lang.org> | 2024-03-10 22:16:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-10 22:16:22 +0000 |
| commit | 76ee6fc926032c16a5706086922fc1125c061b70 (patch) | |
| tree | 6081c0ea7a3e3979b1193e4bdbe612aaeb4d7194 /compiler/rustc_codegen_gcc | |
| parent | 3b1717c052de4a2dbdd3badb0e7a885f40a8ad9e (diff) | |
| parent | 16ffeb208d67b2717bc6826d5310d326096bc27c (diff) | |
| download | rust-76ee6fc926032c16a5706086922fc1125c061b70.tar.gz rust-76ee6fc926032c16a5706086922fc1125c061b70.zip | |
Auto merge of #122312 - matthiaskrgr:rollup-0p8y7gg, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #122275 (disable OOM test in Miri) - #122276 (io::Read trait: make it more clear when we are adressing implementations vs callers) - #122277 (BorrowedCursor docs clarification) - #122286 (use Instance::expect_resolve() instead of unwraping Instance::resolve()) - #122290 (MIR printing: print the path of uneval'd const) - #122293 (diagnostics: Do not suggest using `#[unix_sigpipe]` without a value) - #122297 (bootstrap: document what the triples in 'Build' mean) - #122302 (docs: Correct ptr/ref verbiage in SliceIndex docs.) - #122304 (fix metadata for dyn-star in new solver) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_gcc')
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/context.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_gcc/src/context.rs b/compiler/rustc_codegen_gcc/src/context.rs index bc3d62f2679..8f643c7db72 100644 --- a/compiler/rustc_codegen_gcc/src/context.rs +++ b/compiler/rustc_codegen_gcc/src/context.rs @@ -473,14 +473,12 @@ impl<'gcc, 'tcx> MiscMethods<'tcx> for CodegenCx<'gcc, 'tcx> { let tcx = self.tcx; let func = match tcx.lang_items().eh_personality() { Some(def_id) if !wants_msvc_seh(self.sess()) => { - let instance = ty::Instance::resolve( + let instance = ty::Instance::expect_resolve( tcx, ty::ParamEnv::reveal_all(), def_id, ty::List::empty(), - ) - .unwrap() - .unwrap(); + ); let symbol_name = tcx.symbol_name(instance).name; let fn_abi = self.fn_abi_of_instance(instance, ty::List::empty()); |
