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.

compiler/rustc_borrowck/src/invalidation.rs

@@ -198,7 +198,7 @@ impl<'cx, 'tcx> Visitor<'tcx> for InvalidationGenerator<'cx, 'tcx> {
  }
  }
  TerminatorKind::Goto { target: _ }
- | TerminatorKind::Abort
+ | TerminatorKind::Terminate
  | TerminatorKind::Unreachable
  | TerminatorKind::FalseEdge { real_target: _, imaginary_target: _ }
  | TerminatorKind::FalseUnwind { real_target: _, unwind: _ } => {

compiler/rustc_borrowck/src/lib.rs

@@ -801,7 +801,7 @@ impl<'cx, 'tcx> rustc_mir_dataflow::ResultsVisitor<'cx, 'tcx> for MirBorrowckCtx
  }
 
  TerminatorKind::Goto { target: _ }
- | TerminatorKind::Abort
+ | TerminatorKind::Terminate
  | TerminatorKind::Unreachable
  | TerminatorKind::Resume
  | TerminatorKind::Return
@@ -845,7 +845,7 @@ impl<'cx, 'tcx> rustc_mir_dataflow::ResultsVisitor<'cx, 'tcx> for MirBorrowckCtx
  }
  }
 
- TerminatorKind::Abort
+ TerminatorKind::Terminate
  | TerminatorKind::Assert { .. }
  | TerminatorKind::Call { .. }
  | TerminatorKind::Drop { .. }

compiler/rustc_borrowck/src/type_check/mod.rs

@@ -1300,7 +1300,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
  match &term.kind {
  TerminatorKind::Goto { .. }
  | TerminatorKind::Resume
- | TerminatorKind::Abort
+ | TerminatorKind::Terminate
  | TerminatorKind::Return
  | TerminatorKind::GeneratorDrop
  | TerminatorKind::Unreachable
@@ -1584,7 +1584,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
  span_mirbug!(self, block_data, "resume on non-cleanup block!")
  }
  }
- TerminatorKind::Abort => {
+ TerminatorKind::Terminate => {
  if !is_cleanup {
  span_mirbug!(self, block_data, "abort on non-cleanup block!")
  }

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 => {

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 { .. }

compiler/rustc_codegen_ssa/src/mir/analyze.rs

@@ -284,7 +284,7 @@ pub fn cleanup_kinds(mir: &mir::Body<'_>) -> IndexVec<mir::BasicBlock, CleanupKi
  match data.terminator().kind {
  TerminatorKind::Goto { .. }
  | TerminatorKind::Resume
- | TerminatorKind::Abort
+ | TerminatorKind::Terminate
  | TerminatorKind::Return
  | TerminatorKind::GeneratorDrop
  | TerminatorKind::Unreachable

compiler/rustc_codegen_ssa/src/mir/block.rs

@@ -630,7 +630,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
  MergingSucc::False
  }
 
- fn codegen_abort_terminator(
+ fn codegen_terminate_terminator(
  &mut self,
  helper: TerminatorCodegenHelper<'tcx>,
  bx: &mut Bx,
@@ -1263,8 +1263,8 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
  MergingSucc::False
  }
 
- mir::TerminatorKind::Abort => {
- self.codegen_abort_terminator(helper, bx, terminator);
+ mir::TerminatorKind::Terminate => {
+ self.codegen_terminate_terminator(helper, bx, terminator);
  MergingSucc::False
  }
 

compiler/rustc_codegen_ssa/src/mir/mod.rs

@@ -73,7 +73,7 @@ pub struct FunctionCx<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> {
  /// Cached unreachable block
  unreachable_block: Option<Bx::BasicBlock>,
 
- /// Cached double unwind guarding block
+ /// Cached terminate upon unwinding block
  terminate_block: Option<Bx::BasicBlock>,
 
  /// The location where each MIR arg/var/tmp/ret is stored. This is

compiler/rustc_const_eval/src/interpret/machine.rs

@@ -218,7 +218,7 @@ pub trait Machine<'mir, 'tcx>: Sized {
  unwind: mir::UnwindAction,
  ) -> InterpResult<'tcx>;
 
- /// Called to evaluate `Abort` MIR terminator.
+ /// Called to abort evaluation.
  fn abort(_ecx: &mut InterpCx<'mir, 'tcx, Self>, _msg: String) -> InterpResult<'tcx, !> {
  throw_unsup_format!("aborting execution is not supported")
  }

compiler/rustc_const_eval/src/interpret/terminator.rs

@@ -144,7 +144,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
  }
  }
 
- Abort => {
+ Terminate => {
  M::abort(self, "the program aborted execution".to_owned())?;
  }
 

compiler/rustc_const_eval/src/transform/check_consts/check.rs

@@ -1031,9 +1031,9 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
  self.check_op(ops::Generator(hir::GeneratorKind::Gen))
  }
 
- TerminatorKind::Abort => {
+ TerminatorKind::Terminate => {
  // Cleanup blocks are skipped for const checking (see `visit_basic_block_data`).
- span_bug!(self.span, "`Abort` terminator outside of cleanup block")
+ span_bug!(self.span, "`Terminate` terminator outside of cleanup block")
  }
 
  TerminatorKind::Assert { .. }

compiler/rustc_const_eval/src/transform/check_consts/post_drop_elaboration.rs

@@ -104,7 +104,7 @@ impl<'tcx> Visitor<'tcx> for CheckLiveDrops<'_, 'tcx> {
  }
  }
 
- mir::TerminatorKind::Abort
+ mir::TerminatorKind::Terminate
  | mir::TerminatorKind::Call { .. }
  | mir::TerminatorKind::Assert { .. }
  | mir::TerminatorKind::FalseEdge { .. }

compiler/rustc_const_eval/src/transform/validate.rs

@@ -1015,10 +1015,13 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
  );
  }
  }
- TerminatorKind::Resume | TerminatorKind::Abort => {
+ TerminatorKind::Resume | TerminatorKind::Terminate => {
  let bb = location.block;
  if !self.body.basic_blocks[bb].is_cleanup {
- self.fail(location, "Cannot `Resume` or `Abort` from non-cleanup basic block")
+ self.fail(
+ location,
+ "Cannot `Resume` or `Terminate` from non-cleanup basic block",
+ )
  }
  }
  TerminatorKind::Return => {

compiler/rustc_middle/src/mir/patch.rs

@@ -37,7 +37,19 @@ impl<'tcx> MirPatch<'tcx> {
  // Check if we already have a resume block
  if let TerminatorKind::Resume = block.terminator().kind && block.statements.is_empty() {
  result.resume_block = Some(bb);
- break;
+ continue;
+ }
+
+ // Check if we already have an unreachable block
+ if let TerminatorKind::Unreachable = block.terminator().kind && block.statements.is_empty() {
+ result.unreachable_block = Some(bb);
+ continue;
+ }
+
+ // Check if we already have a terminate block
+ if let TerminatorKind::Terminate = block.terminator().kind && block.statements.is_empty() {
+ result.terminate_block = Some(bb);
+ continue;
  }
  }
 
@@ -61,6 +73,40 @@ impl<'tcx> MirPatch<'tcx> {
  bb
  }
 
+ pub fn unreachable_block(&mut self) -> BasicBlock {
+ if let Some(bb) = self.unreachable_block {
+ return bb;
+ }
+
+ let bb = self.new_block(BasicBlockData {
+ statements: vec![],
+ terminator: Some(Terminator {
+ source_info: SourceInfo::outermost(self.body_span),
+ kind: TerminatorKind::Unreachable,
+ }),
+ is_cleanup: true,
+ });
+ self.unreachable_block = Some(bb);
+ bb
+ }
+
+ pub fn terminate_block(&mut self) -> BasicBlock {
+ if let Some(bb) = self.terminate_block {
+ return bb;
+ }
+
+ let bb = self.new_block(BasicBlockData {
+ statements: vec![],
+ terminator: Some(Terminator {
+ source_info: SourceInfo::outermost(self.body_span),
+ kind: TerminatorKind::Terminate,
+ }),
+ is_cleanup: true,
+ });
+ self.terminate_block = Some(bb);
+ bb
+ }
+
  pub fn is_patched(&self, bb: BasicBlock) -> bool {
  self.patch_map[bb].is_some()
  }

compiler/rustc_middle/src/mir/spanview.rs

@@ -262,7 +262,7 @@ pub fn terminator_kind_name(term: &Terminator<'_>) -> &'static str {
  Goto { .. } => "Goto",
  SwitchInt { .. } => "SwitchInt",
  Resume => "Resume",
- Abort => "Abort",
+ Terminate => "Terminate",
  Return => "Return",
  Unreachable => "Unreachable",
  Drop { .. } => "Drop",

compiler/rustc_middle/src/mir/syntax.rs

@@ -522,8 +522,8 @@ pub struct CopyNonOverlapping<'tcx> {
 ///
 /// The basic block pointed to by a `Cleanup` unwind action must have its `cleanup` flag set.
 /// `cleanup` basic blocks have a couple restrictions:
-/// 1. All `unwind` fields in them must be `UnwindAction::Continue`.
-/// 2. `Return` terminators are not allowed in them. `Abort` and `Unwind` terminators are.
+/// 1. All `unwind` fields in them must be `UnwindAction::Terminate` or `UnwindAction::Unreachable`.
+/// 2. `Return` terminators are not allowed in them. `Terminate` and `Unwind` terminators are.
 /// 3. All other basic blocks (in the current body) that are reachable from `cleanup` basic blocks
 /// must also be `cleanup`. This is a part of the type system and checked statically, so it is
 /// still an error to have such an edge in the CFG even if it's known that it won't be taken at
@@ -565,11 +565,11 @@ pub enum TerminatorKind<'tcx> {
  /// deaggregation runs.
  Resume,
 
- /// Indicates that the landing pad is finished and that the process should abort.
+ /// Indicates that the landing pad is finished and that the process should terminate.
  ///
  /// Used to prevent unwinding for foreign items or with `-C unwind=abort`. Only permitted in
  /// cleanup blocks.
- Abort,
+ Terminate,
 
  /// Returns from the function.
  ///

compiler/rustc_middle/src/mir/terminator.rs

@@ -155,7 +155,7 @@ impl<'tcx> TerminatorKind<'tcx> {
  Some(t).into_iter().chain((&[]).into_iter().copied())
  }
  Resume
- | Abort
+ | Terminate
  | GeneratorDrop
  | Return
  | Unreachable
@@ -197,7 +197,7 @@ impl<'tcx> TerminatorKind<'tcx> {
  Some(t).into_iter().chain(&mut [])
  }
  Resume
- | Abort
+ | Terminate
  | GeneratorDrop
  | Return
  | Unreachable
@@ -214,7 +214,7 @@ impl<'tcx> TerminatorKind<'tcx> {
  match *self {
  TerminatorKind::Goto { .. }
  | TerminatorKind::Resume
- | TerminatorKind::Abort
+ | TerminatorKind::Terminate
  | TerminatorKind::Return
  | TerminatorKind::Unreachable
  | TerminatorKind::GeneratorDrop
@@ -233,7 +233,7 @@ impl<'tcx> TerminatorKind<'tcx> {
  match *self {
  TerminatorKind::Goto { .. }
  | TerminatorKind::Resume
- | TerminatorKind::Abort
+ | TerminatorKind::Terminate
  | TerminatorKind::Return
  | TerminatorKind::Unreachable
  | TerminatorKind::GeneratorDrop
@@ -310,7 +310,7 @@ impl<'tcx> TerminatorKind<'tcx> {
  Return => write!(fmt, "return"),
  GeneratorDrop => write!(fmt, "generator_drop"),
  Resume => write!(fmt, "resume"),
- Abort => write!(fmt, "abort"),
+ Terminate => write!(fmt, "abort"),
  Yield { value, resume_arg, .. } => write!(fmt, "{:?} = yield({:?})", resume_arg, value),
  Unreachable => write!(fmt, "unreachable"),
  Drop { place, .. } => write!(fmt, "drop({:?})", place),
@@ -389,7 +389,7 @@ impl<'tcx> TerminatorKind<'tcx> {
  pub fn fmt_successor_labels(&self) -> Vec<Cow<'static, str>> {
  use self::TerminatorKind::*;
  match *self {
- Return | Resume | Abort | Unreachable | GeneratorDrop => vec![],
+ Return | Resume | Terminate | Unreachable | GeneratorDrop => vec![],
  Goto { .. } => vec!["".into()],
  SwitchInt { ref targets, .. } => targets
  .values

compiler/rustc_middle/src/mir/visit.rs

@@ -462,7 +462,7 @@ macro_rules! make_mir_visitor {
  match kind {
  TerminatorKind::Goto { .. } |
  TerminatorKind::Resume |
- TerminatorKind::Abort |
+ TerminatorKind::Terminate |
  TerminatorKind::GeneratorDrop |
  TerminatorKind::Unreachable |
  TerminatorKind::FalseEdge { .. } |

compiler/rustc_mir_build/src/build/scope.rs

@@ -1454,7 +1454,7 @@ impl<'tcx> DropTreeBuilder<'tcx> for Unwind {
  TerminatorKind::Goto { .. }
  | TerminatorKind::SwitchInt { .. }
  | TerminatorKind::Resume
- | TerminatorKind::Abort
+ | TerminatorKind::Terminate
  | TerminatorKind::Return
  | TerminatorKind::Unreachable
  | TerminatorKind::Yield { .. }

compiler/rustc_mir_build/src/lints.rs

@@ -108,7 +108,7 @@ impl<'mir, 'tcx> TriColorVisitor<BasicBlocks<'tcx>> for Search<'mir, 'tcx> {
 
  match self.body[bb].terminator().kind {
  // These terminators return control flow to the caller.
- TerminatorKind::Abort
+ TerminatorKind::Terminate
  | TerminatorKind::GeneratorDrop
  | TerminatorKind::Resume
  | TerminatorKind::Return

compiler/rustc_mir_dataflow/src/framework/direction.rs

@@ -474,7 +474,7 @@ impl Direction for Forward {
  {
  use mir::TerminatorKind::*;
  match bb_data.terminator().kind {
- Return | Resume | Abort | GeneratorDrop | Unreachable => {}
+ Return | Resume | Terminate | GeneratorDrop | Unreachable => {}
 
  Goto { target } => propagate(target, exit_state),
 

compiler/rustc_mir_dataflow/src/impls/borrowed_locals.rs

@@ -125,7 +125,7 @@ where
  }
  }
 
- TerminatorKind::Abort
+ TerminatorKind::Terminate
  | TerminatorKind::Assert { .. }
  | TerminatorKind::Call { .. }
  | TerminatorKind::FalseEdge { .. }

compiler/rustc_mir_dataflow/src/impls/storage_liveness.rs

@@ -200,7 +200,7 @@ impl<'mir, 'tcx> crate::GenKillAnalysis<'tcx> for MaybeRequiresStorage<'mir, 'tc
 
  // Nothing to do for these. Match exhaustively so this fails to compile when new
  // variants are added.
- TerminatorKind::Abort
+ TerminatorKind::Terminate
  | TerminatorKind::Assert { .. }
  | TerminatorKind::Drop { .. }
  | TerminatorKind::FalseEdge { .. }
@@ -237,7 +237,7 @@ impl<'mir, 'tcx> crate::GenKillAnalysis<'tcx> for MaybeRequiresStorage<'mir, 'tc
  // Nothing to do for these. Match exhaustively so this fails to compile when new
  // variants are added.
  TerminatorKind::Yield { .. }
- | TerminatorKind::Abort
+ | TerminatorKind::Terminate
  | TerminatorKind::Assert { .. }
  | TerminatorKind::Drop { .. }
  | TerminatorKind::FalseEdge { .. }

compiler/rustc_mir_dataflow/src/move_paths/builder.rs

@@ -375,7 +375,7 @@ impl<'b, 'a, 'tcx> Gatherer<'b, 'a, 'tcx> {
  // need recording.
  | TerminatorKind::Return
  | TerminatorKind::Resume
- | TerminatorKind::Abort
+ | TerminatorKind::Terminate
  | TerminatorKind::GeneratorDrop
  | TerminatorKind::Unreachable
  | TerminatorKind::Drop { .. } => {}

compiler/rustc_mir_transform/src/check_unsafety.rs

@@ -57,7 +57,7 @@ impl<'tcx> Visitor<'tcx> for UnsafetyChecker<'_, 'tcx> {
  | TerminatorKind::Assert { .. }
  | TerminatorKind::GeneratorDrop
  | TerminatorKind::Resume
- | TerminatorKind::Abort
+ | TerminatorKind::Terminate
  | TerminatorKind::Return
  | TerminatorKind::Unreachable
  | TerminatorKind::FalseEdge { .. }

compiler/rustc_mir_transform/src/const_prop.rs

@@ -959,7 +959,7 @@ impl<'tcx> MutVisitor<'tcx> for ConstPropagator<'_, 'tcx> {
  // None of these have Operands to const-propagate.
  TerminatorKind::Goto { .. }
  | TerminatorKind::Resume
- | TerminatorKind::Abort
+ | TerminatorKind::Terminate
  | TerminatorKind::Return
  | TerminatorKind::Unreachable
  | TerminatorKind::Drop { .. }