Rollup merge of #69960 - RalfJung:abort, r=oli-obk
miri engine: fix treatment of abort intrinsic I screwed up in https://github.com/rust-lang/rust/pull/69830 and added `abort` to the wrong block of intrinsics, namely the one that actually has a return place. So that branch was never actually reached. r? @oli-obk
This commit is contained in:
commit
f2af2cff0f
|
@ -84,14 +84,15 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
|
||||||
let substs = instance.substs;
|
let substs = instance.substs;
|
||||||
let intrinsic_name = self.tcx.item_name(instance.def_id());
|
let intrinsic_name = self.tcx.item_name(instance.def_id());
|
||||||
|
|
||||||
// We currently do not handle any intrinsics that are *allowed* to diverge,
|
// First handle intrinsics without return place.
|
||||||
// but `transmute` could lack a return place in case of UB.
|
|
||||||
let (dest, ret) = match ret {
|
let (dest, ret) = match ret {
|
||||||
Some(p) => p,
|
|
||||||
None => match intrinsic_name {
|
None => match intrinsic_name {
|
||||||
sym::transmute => throw_ub!(Unreachable),
|
sym::transmute => throw_ub_format!("transmuting to uninhabited type"),
|
||||||
|
sym::abort => M::abort(self)?,
|
||||||
|
// Unsupported diverging intrinsic.
|
||||||
_ => return Ok(false),
|
_ => return Ok(false),
|
||||||
},
|
},
|
||||||
|
Some(p) => p,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Keep the patterns in this match ordered the same as the list in
|
// Keep the patterns in this match ordered the same as the list in
|
||||||
|
@ -103,10 +104,6 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
|
||||||
self.write_scalar(location.ptr, dest)?;
|
self.write_scalar(location.ptr, dest)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
sym::abort => {
|
|
||||||
M::abort(self)?;
|
|
||||||
}
|
|
||||||
|
|
||||||
sym::min_align_of
|
sym::min_align_of
|
||||||
| sym::pref_align_of
|
| sym::pref_align_of
|
||||||
| sym::needs_drop
|
| sym::needs_drop
|
||||||
|
|
|
@ -4,7 +4,7 @@ warning: any use of this value will cause an error
|
||||||
LL | unsafe { std::mem::transmute(()) }
|
LL | unsafe { std::mem::transmute(()) }
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^
|
| ^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
| |
|
| |
|
||||||
| entering unreachable code
|
| transmuting to uninhabited type
|
||||||
| inside call to `foo` at $DIR/validate_uninhabited_zsts.rs:14:26
|
| inside call to `foo` at $DIR/validate_uninhabited_zsts.rs:14:26
|
||||||
...
|
...
|
||||||
LL | const FOO: [Empty; 3] = [foo(); 3];
|
LL | const FOO: [Empty; 3] = [foo(); 3];
|
||||||
|
|
Loading…
Reference in New Issue