OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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`
This commit is contained in:
bors 2020-12-11 12:30:05 +00:00
commit a9f7d19a91
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_mir/src/interpret/intrinsics.rs
View File

@ -414,7 +414,13 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
if layout.abi.is_uninhabited() { if layout.abi.is_uninhabited() {
// The run-time intrinsic panics just to get a good backtrace; here we abort // 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. // 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 => { sym::simd_insert => {

0
src/test/ui/assume-type-intrinsics.rs → src/test/ui/consts/assume-type-intrinsics.rs
View File

2
src/test/ui/assume-type-intrinsics.stderr → src/test/ui/consts/assume-type-intrinsics.stderr
View File

@ -4,7 +4,7 @@ error: any use of this value will cause an error
LL | intrinsics::assert_inhabited::<T>(); 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 `MaybeUninit::<!>::assume_init` at $SRC_DIR/core/src/mem/maybe_uninit.rs:LL:COL
| inside `_BAD` at $DIR/assume-type-intrinsics.rs:11:9 | inside `_BAD` at $DIR/assume-type-intrinsics.rs:11:9
| |