bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

interpret: mark a dead match arm as dead

Browse source
This commit is contained in:
Ralf Jung 2022-03-26 13:03:49 -04:00
parent 1fca19c8ca
commit 78b680e14a
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_const_eval/src/interpret/eval_context.rs
View file

@ -444,6 +444,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
match scalar.try_to_int() { match scalar.try_to_int() {
Ok(int) => int.is_null(), Ok(int) => int.is_null(),
Err(_) => { Err(_) => {
// Can only happen during CTFE.
let ptr = self.scalar_to_ptr(scalar); let ptr = self.scalar_to_ptr(scalar);
match self.memory.ptr_try_get_alloc(ptr) { match self.memory.ptr_try_get_alloc(ptr) {
Ok((alloc_id, offset, _)) => { Ok((alloc_id, offset, _)) => {
@ -455,7 +456,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
// Note that one-past-the-end (offset == size) is still inbounds, and never null. // Note that one-past-the-end (offset == size) is still inbounds, and never null.
offset > size offset > size
} }
Err(offset) => offset == 0, Err(_offset) => bug!("a non-int scalar is always a pointer"),
} }
} }
} }