Auto merge of #79910 - RalfJung:abort-msg, r=oli-obk

CTFE: tweak abort-on-uninhabited message Having an "aborted execution:" makes it more consistent with the `Abort` terminator saying "the program aborted execution". Right now, at least one of the two errors will look weird in Miri. r? `@oli-obk`
rust-lang · Dec 11, 2020 · a9f7d19 · a9f7d19
2 parents 19eb1c4 + d8ee8e7
commit a9f7d19
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/compiler/rustc_mir/src/interpret/intrinsics.rs b/compiler/rustc_mir/src/interpret/intrinsics.rs
@@ -414,7 +414,13 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                 if layout.abi.is_uninhabited() {
                     // The run-time intrinsic panics just to get a good backtrace; here we abort
                     // since there is no problem showing a backtrace even for aborts.
-                    M::abort(self, format!("attempted to instantiate uninhabited type `{}`", ty))?;
+                    M::abort(
+                        self,
+                        format!(
+                            "aborted execution: attempted to instantiate uninhabited type `{}`",
+                            ty
+                        ),
+                    )?;
                 }
             }
             sym::simd_insert => {

diff --git a/src/test/ui/assume-type-intrinsics.rs → src/test/ui/consts/assume-type-intrinsics.rs b/src/test/ui/assume-type-intrinsics.rs → src/test/ui/consts/assume-type-intrinsics.rs
diff --git a/src/test/ui/assume-type-intrinsics.stderr → ...t/ui/consts/assume-type-intrinsics.stderr b/src/test/ui/assume-type-intrinsics.stderr → ...t/ui/consts/assume-type-intrinsics.stderr
@@ -4,7 +4,7 @@ error: any use of this value will cause an error
 LL |               intrinsics::assert_inhabited::<T>();
    |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |               |
-   |               attempted to instantiate uninhabited type `!`
+   |               aborted execution: attempted to instantiate uninhabited type `!`
    |               inside `MaybeUninit::<!>::assume_init` at $SRC_DIR/core/src/mem/maybe_uninit.rs:LL:COL
    |               inside `_BAD` at $DIR/assume-type-intrinsics.rs:11:9
    |