nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-31 22:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

const_eval machine: use original instance for replaced MIR bodies

Browse Source
This commit is contained in:
Ralf Jung 2021-11-29 22:02:17 -05:00
parent 11fb22d83a
commit fcc5fd6135
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/rustc_const_eval/src/const_eval/machine.rs
View File

@ -279,7 +279,17 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
if let Some(new_instance) = ecx.hook_special_const_fn(instance, args)? { if let Some(new_instance) = ecx.hook_special_const_fn(instance, args)? {
// We call another const fn instead. // We call another const fn instead.
return Self::find_mir_or_eval_fn(ecx, new_instance, _abi, args, _ret, _unwind); // However, we return the *original* instance to make backtraces work out
// (and we hope this does not confuse the FnAbi checks too much).
return Ok(Self::find_mir_or_eval_fn(
ecx,
new_instance,
_abi,
args,
_ret,
_unwind,
)?
.map(|(body, _instance)| (body, instance)));
} }
} }
// This is a const fn. Call it. // This is a const fn. Call it.