diff --git a/compiler/rustc_mir/src/interpret/intrinsics.rs b/compiler/rustc_mir/src/interpret/intrinsics.rs index 2ffb7a05f25c0..dfd77a8fca964 100644 --- 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 b/src/test/ui/consts/assume-type-intrinsics.rs similarity index 100% rename from src/test/ui/assume-type-intrinsics.rs rename to src/test/ui/consts/assume-type-intrinsics.rs diff --git a/src/test/ui/assume-type-intrinsics.stderr b/src/test/ui/consts/assume-type-intrinsics.stderr similarity index 89% rename from src/test/ui/assume-type-intrinsics.stderr rename to src/test/ui/consts/assume-type-intrinsics.stderr index 6f400086a548c..ed09f74e9b1f2 100644 --- a/src/test/ui/assume-type-intrinsics.stderr +++ b/src/test/ui/consts/assume-type-intrinsics.stderr @@ -4,7 +4,7 @@ error: any use of this value will cause an error LL | intrinsics::assert_inhabited::(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | | - | 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 |