user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove ad-hoc 'never' type check in read_lvalue

Browse source
This commit is contained in:
Ralf Jung 2017-07-19 20:32:51 -07:00
parent 27c64479cd
commit 3b19c83c67
2 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/lvalue.rs
View file

@ -182,7 +182,6 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
/// Returns a value and (in case of a ByRef) if we are supposed to use aligned accesses.
pub(super) fn eval_and_read_lvalue(&mut self, lvalue: &mir::Lvalue<'tcx>) -> EvalResult<'tcx, Value> {
let ty = self.lvalue_ty(lvalue);
// Shortcut for things like accessing a fat pointer's field,
// which would otherwise (in the `eval_lvalue` path) require moving a `ByValPair` to memory
// and returning an `Lvalue::Ptr` to it
@ -190,14 +189,10 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
return Ok(val);
}
let lvalue = self.eval_lvalue(lvalue)?;
self.read_lvalue(lvalue, ty)
self.read_lvalue(lvalue)
}
pub fn read_lvalue(&self, lvalue: Lvalue<'tcx>, ty: Ty<'tcx>) -> EvalResult<'tcx, Value> {
if ty.is_never() {
return Err(EvalError::Unreachable);
}
pub fn read_lvalue(&self, lvalue: Lvalue<'tcx>) -> EvalResult<'tcx, Value> {
match lvalue {
Lvalue::Ptr { ptr, extra, aligned } => {
assert_eq!(extra, LvalueExtra::None);
@ -382,7 +377,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
}
Deref => {
let val = self.read_lvalue(base, base_ty)?;
let val = self.read_lvalue(base)?;
let pointee_type = match base_ty.sty {
ty::TyRawPtr(ref tam) |

2
tests/compile-fail/never_say_never.rs
View file

@ -4,7 +4,7 @@
fn main() {
let y = &5;
let x: ! = unsafe {
*(y as *const _ as *const !) //~ ERROR entered unreachable code
*(y as *const _ as *const !) //~ ERROR tried to access a dead local variable
};
f(x)
}