diff options
| author | bors <bors@rust-lang.org> | 2023-05-17 06:42:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-17 06:42:07 +0000 |
| commit | c2ccc855e74aec03e434405eca3c247ee2432e53 (patch) | |
| tree | 123b2319d3e649afa4438cc57830d30f5c87db1d /compiler/rustc_codegen_cranelift/src | |
| parent | 6c64870fa67f0227f40f6adc25a6944e95c2959f (diff) | |
| parent | 072074383627a6e5eb43c72522ae09010eb218c0 (diff) | |
| download | rust-c2ccc855e74aec03e434405eca3c247ee2432e53.tar.gz rust-c2ccc855e74aec03e434405eca3c247ee2432e53.zip | |
Auto merge of #111671 - Dylan-DPC:rollup-1jy5r16, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #110145 (Share slice of bytes) - #111043 (Stabilize feature `cstr_is_empty`) - #111648 (Remove `LangItems::require`) - #111649 (Add derive for `core::marker::ConstParamTy`) - #111654 (Add a conversion from `&mut T` to `&mut UnsafeCell<T>`) - #111661 (Erase regions of type in `offset_of!`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_cranelift/src')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/base.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/base.rs b/compiler/rustc_codegen_cranelift/src/base.rs index e9dbea1be67..25fd5ca3ae8 100644 --- a/compiler/rustc_codegen_cranelift/src/base.rs +++ b/compiler/rustc_codegen_cranelift/src/base.rs @@ -966,11 +966,7 @@ fn codegen_panic_inner<'tcx>( args: &[Value], span: Span, ) { - let def_id = fx - .tcx - .lang_items() - .require(lang_item) - .unwrap_or_else(|e| fx.tcx.sess.span_fatal(span, e.to_string())); + let def_id = fx.tcx.require_lang_item(lang_item, Some(span)); let instance = Instance::mono(fx.tcx, def_id).polymorphize(fx.tcx); let symbol_name = fx.tcx.symbol_name(instance).name; |