we are on 2018 edition, use try block

This commit is contained in:
Ralf Jung 2020-03-09 21:43:05 +01:00
parent d8f81680a1
commit 9681422943

View File

@ -261,10 +261,9 @@ fn eval_fn_call(
StackPopCleanup::Goto { ret: ret.map(|p| p.1), unwind },
)?;
// We want to pop this frame again in case there was an error, to put
// the blame in the right location. Until the 2018 edition is used in
// the compiler, we have to do this with an immediately invoked function.
let res = (|| {
// If an error is raised here, pop the frame again to get an accurate backtrace.
// To this end, we wrap it all in a `try` block.
let res: InterpResult<'tcx> = try {
trace!(
"caller ABI: {:?}, args: {:#?}",
caller_abi,
@ -363,8 +362,7 @@ fn eval_fn_call(
throw_ub_format!("calling a returning function without a return place")
}
}
Ok(())
})();
};
match res {
Err(err) => {
self.stack.pop();