diff options
| author | Gary Guo <gary@garyguo.net> | 2022-10-10 23:17:07 +0100 |
|---|---|---|
| committer | Gary Guo <gary@garyguo.net> | 2023-04-06 09:34:16 +0100 |
| commit | 5cbda2a55e40c9d978850ebc3175d9a9e1dbea92 (patch) | |
| tree | 4b9cf69c7d050f8800260f2e4eb386e0cccfb004 | |
| parent | 3af45d6c571ab634dfb3dcc941b32afe4119e934 (diff) | |
| download | rust-5cbda2a55e40c9d978850ebc3175d9a9e1dbea92.tar.gz rust-5cbda2a55e40c9d978850ebc3175d9a9e1dbea92.zip | |
Fix tools
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/eval_context.rs | 1 | ||||
| -rw-r--r-- | src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/eval_context.rs b/compiler/rustc_const_eval/src/interpret/eval_context.rs index 209656cdf5c..3e58a58aef7 100644 --- a/compiler/rustc_const_eval/src/interpret/eval_context.rs +++ b/compiler/rustc_const_eval/src/interpret/eval_context.rs @@ -737,6 +737,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { throw_ub_format!("unwinding past a stack frame that does not allow unwinding") } mir::UnwindAction::Terminate => { + self.frame_mut().loc = Right(self.frame_mut().body.span); M::abort(self, "panic in a function that cannot unwind".to_owned())?; } }; diff --git a/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs b/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs index ff195cd7288..354b6d71aa4 100644 --- a/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs +++ b/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs @@ -301,13 +301,13 @@ fn check_terminator<'tcx>( | TerminatorKind::Goto { .. } | TerminatorKind::Return | TerminatorKind::Resume + | TerminatorKind::Terminate | TerminatorKind::Unreachable => Ok(()), TerminatorKind::Drop { place, .. } => check_place(tcx, *place, span, body), TerminatorKind::SwitchInt { discr, targets: _ } => check_operand(tcx, discr, span, body), - TerminatorKind::Abort => Err((span, "abort is not stable in const fn".into())), TerminatorKind::GeneratorDrop | TerminatorKind::Yield { .. } => { Err((span, "const fn generators are unstable".into())) }, |