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 | e3f2edc75bf2becb57d7d770bba20606da1c4224 (patch) | |
tree | e9a882f5219677941d8a0c5112e65a32b28b746f /compiler/rustc_codegen_cranelift | |
parent | 0a5dac3062ffc80a283943e49e2ada08f0b0eaf7 (diff) | |
download | rust-e3f2edc75bf2becb57d7d770bba20606da1c4224.tar.gz |
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.
Diffstat (limited to 'compiler/rustc_codegen_cranelift')
-rw-r--r-- | compiler/rustc_codegen_cranelift/src/base.rs | 2 | ||||
-rw-r--r-- | compiler/rustc_codegen_cranelift/src/constant.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/base.rs b/compiler/rustc_codegen_cranelift/src/base.rs index 94413318492..f5301f9f7f1 100644 --- a/compiler/rustc_codegen_cranelift/src/base.rs +++ b/compiler/rustc_codegen_cranelift/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/compiler/rustc_codegen_cranelift/src/constant.rs b/compiler/rustc_codegen_cranelift/src/constant.rs index ebb4de33f99..e87f4e25891 100644 --- a/compiler/rustc_codegen_cranelift/src/constant.rs +++ b/compiler/rustc_codegen_cranelift/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 { .. } |