diff options
| author | Gary Guo <gary@garyguo.net> | 2022-11-17 16:07:45 +0000 |
|---|---|---|
| committer | Gary Guo <gary@garyguo.net> | 2023-04-06 09:34:16 +0100 |
| commit | 5ae3a53a447bab9501ecb86b3fa686488c9f48dd (patch) | |
| tree | bc662ad8c59e82bc5c7f9c50b935fee2b8f3bbd3 | |
| parent | de3f8a157809bd1972be268fbb0f663f7dfa6657 (diff) | |
| download | rust-5ae3a53a447bab9501ecb86b3fa686488c9f48dd.tar.gz rust-5ae3a53a447bab9501ecb86b3fa686488c9f48dd.zip | |
Revert box_free unwind action
| -rw-r--r-- | compiler/rustc_mir_dataflow/src/elaborate_drops.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/rustc_mir_dataflow/src/elaborate_drops.rs b/compiler/rustc_mir_dataflow/src/elaborate_drops.rs index ba51adee308..bd8ec82dffd 100644 --- a/compiler/rustc_mir_dataflow/src/elaborate_drops.rs +++ b/compiler/rustc_mir_dataflow/src/elaborate_drops.rs @@ -946,7 +946,11 @@ where args, destination: unit_temp, target: Some(target), - unwind: UnwindAction::Terminate, + unwind: if unwind.is_cleanup() { + UnwindAction::Terminate + } else { + UnwindAction::Continue + }, from_hir_call: false, fn_span: self.source_info.span, }; // FIXME(#43234) |