diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-03-10 22:16:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-10 22:16:43 +0100 |
| commit | b02f2a0e76f46f7ed244a686c4909635495ee254 (patch) | |
| tree | ad1c9e9fbbf48b44f8b59490edfd25e26534bfce /compiler/rustc_codegen_llvm/src | |
| parent | ff09d32d8321cce425e5f266e1b9372e9b749a20 (diff) | |
| parent | aa9145e6ea9ae518355b2c8c7f6de6d61c385e38 (diff) | |
| download | rust-b02f2a0e76f46f7ed244a686c4909635495ee254.tar.gz rust-b02f2a0e76f46f7ed244a686c4909635495ee254.zip | |
Rollup merge of #122286 - RalfJung:resolve, r=compiler-errors
use Instance::expect_resolve() instead of unwraping Instance::resolve()
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/context.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs index d1f32087908..37c690a0128 100644 --- a/compiler/rustc_codegen_llvm/src/context.rs +++ b/compiler/rustc_codegen_llvm/src/context.rs @@ -558,11 +558,12 @@ impl<'ll, 'tcx> MiscMethods<'tcx> for CodegenCx<'ll, 'tcx> { let tcx = self.tcx; let llfn = match tcx.lang_items().eh_personality() { - Some(def_id) if name.is_none() => self.get_fn_addr( - ty::Instance::resolve(tcx, ty::ParamEnv::reveal_all(), def_id, ty::List::empty()) - .unwrap() - .unwrap(), - ), + Some(def_id) if name.is_none() => self.get_fn_addr(ty::Instance::expect_resolve( + tcx, + ty::ParamEnv::reveal_all(), + def_id, + ty::List::empty(), + )), _ => { let name = name.unwrap_or("rust_eh_personality"); if let Some(llfn) = self.get_declared_value(name) { |