diff options
| author | The Miri Cronjob Bot <miri@cron.bot> | 2024-03-29 05:02:09 +0000 |
|---|---|---|
| committer | The Miri Cronjob Bot <miri@cron.bot> | 2024-03-29 05:02:09 +0000 |
| commit | ed29546a27db9fa024c6f99a7dd001e86d75e14f (patch) | |
| tree | a5635c4d1821e9114fe7cc27d00353f98cac5402 /compiler/rustc_codegen_ssa | |
| parent | 29a59beaa6bc7841b12d6523bd638dbd6e7d0b01 (diff) | |
| parent | 5eb78c515c777c232c35b2e606bcec7cefe875af (diff) | |
| download | rust-ed29546a27db9fa024c6f99a7dd001e86d75e14f.tar.gz rust-ed29546a27db9fa024c6f99a7dd001e86d75e14f.zip | |
Merge from rustc
Diffstat (limited to 'compiler/rustc_codegen_ssa')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/mir/block.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_ssa/src/mir/block.rs b/compiler/rustc_codegen_ssa/src/mir/block.rs index 8c668597a43..d4123329f44 100644 --- a/compiler/rustc_codegen_ssa/src/mir/block.rs +++ b/compiler/rustc_codegen_ssa/src/mir/block.rs @@ -682,10 +682,8 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { (LangItem::PanicMisalignedPointerDereference, vec![required, found, location]) } _ => { - let msg = bx.const_str(msg.description()); - // It's `pub fn panic(expr: &str)`, with the wide reference being passed - // as two arguments, and `#[track_caller]` adds an implicit third argument. - (LangItem::Panic, vec![msg.0, msg.1, location]) + // It's `pub fn panic_...()` and `#[track_caller]` adds an implicit argument. + (msg.panic_function(), vec![location]) } }; |