diff options
| author | Ralf Jung <post@ralfj.de> | 2025-03-21 09:56:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-21 09:56:15 +0000 |
| commit | 3a0ef6bdc119fa0ee0dbdbc3580b87adbdac754b (patch) | |
| tree | 4dc3e474501cac1e79ae0c343a341fb3b3f89f36 /src/tools | |
| parent | 08e79dde02b28903796a84be90bfeefdc5321535 (diff) | |
| parent | 38e7bb0fb1c53d4ddf7b333eb242839e4d226e28 (diff) | |
| download | rust-3a0ef6bdc119fa0ee0dbdbc3580b87adbdac754b.tar.gz rust-3a0ef6bdc119fa0ee0dbdbc3580b87adbdac754b.zip | |
Merge pull request #4235 from RalfJung/catch_unwind
catch_unwind: do not permit catch function to unwind
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/miri/src/shims/panic.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/miri/src/shims/panic.rs b/src/tools/miri/src/shims/panic.rs index fc58d88591f..18af8214876 100644 --- a/src/tools/miri/src/shims/panic.rs +++ b/src/tools/miri/src/shims/panic.rs @@ -144,7 +144,8 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> { // Directly return to caller of `try`. StackPopCleanup::Goto { ret: catch_unwind.ret, - unwind: mir::UnwindAction::Continue, + // `catch_fn` must not unwind. + unwind: mir::UnwindAction::Unreachable, }, )?; |