diff options
| author | Gary Guo <gary@garyguo.net> | 2022-10-31 01:01:24 +0000 |
|---|---|---|
| committer | Gary Guo <gary@garyguo.net> | 2023-04-06 09:34:16 +0100 |
| commit | 446650cb008d7f7c3fee06b9692d2f42d48041d5 (patch) | |
| tree | e5c36077d5cb803d9f792dbd75dfe2cf21faa004 | |
| parent | 9da329d243129b7383a65e4e2651ff9b663bdffd (diff) | |
| download | rust-446650cb008d7f7c3fee06b9692d2f42d48041d5.tar.gz rust-446650cb008d7f7c3fee06b9692d2f42d48041d5.zip | |
Rename `Abort` terminator to `Terminate`
Unify terminology used in unwind action and terminator, and reflect the fact that a nounwind panic is triggered instead of an immediate abort is triggered for this terminator.
| -rw-r--r-- | src/base.rs | 2 | ||||
| -rw-r--r-- | src/constant.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/base.rs b/src/base.rs index 94413318492..f5301f9f7f1 100644 --- a/src/base.rs +++ b/src/base.rs @@ -488,7 +488,7 @@ fn codegen_fn_body(fx: &mut FunctionCx<'_, '_, '_>, start_block: Block) { *destination, ); } - TerminatorKind::Abort => { + TerminatorKind::Terminate => { codegen_panic_cannot_unwind(fx, source_info); } TerminatorKind::Resume => { diff --git a/src/constant.rs b/src/constant.rs index ebb4de33f99..e87f4e25891 100644 --- a/src/constant.rs +++ b/src/constant.rs @@ -549,7 +549,7 @@ pub(crate) fn mir_operand_get_const_val<'tcx>( TerminatorKind::Goto { .. } | TerminatorKind::SwitchInt { .. } | TerminatorKind::Resume - | TerminatorKind::Abort + | TerminatorKind::Terminate | TerminatorKind::Return | TerminatorKind::Unreachable | TerminatorKind::Drop { .. } |