bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Partially outline code inside the panic! macro

Browse source
This commit is contained in:
John Kåre Alsaker 2023-09-03 06:31:56 +02:00
parent 15e52b05ca
commit 6a02baaa3d
11 changed files with 117 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_const_eval/src/const_eval/machine.rs
View file

@ -207,7 +207,7 @@ impl<'mir, 'tcx: 'mir> CompileTimeEvalContext<'mir, 'tcx> {
) -> InterpResult<'tcx, Option<ty::Instance<'tcx>>> {
let def_id = instance.def_id();
if Some(def_id) == self.tcx.lang_items().panic_display()
if self.tcx.has_attr(def_id, sym::rustc_const_panic_str)
|| Some(def_id) == self.tcx.lang_items().begin_panic_fn()
{
let args = self.copy_fn_args(args)?;