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

fn ptrs and never were accidentally disabled (55)

Browse source
This commit is contained in:
Ralf Jung 2017-07-13 20:28:00 -07:00 • committed by Oliver Schneider
parent 8e495999df
commit 66e55b0d6e
No known key found for this signature in database
GPG key ID: A69F8D225B3AD7D9
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/librustc_mir/interpret/lvalue.rs
View file

@ -529,7 +529,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
let is_owning = match ty.sty {
TyInt(_) | TyUint(_) | TyRawPtr(_) |
TyBool | TyFloat(_) | TyChar | TyStr |
TyRef(..) => true,
TyRef(..) | TyFnPtr(..) | TyNever => true,
TyAdt(adt, _) if adt.is_box() => true,
TySlice(_) | TyAdt(_, _) | TyTuple(..) | TyClosure(..) | TyArray(..) => false,
TyParam(_) | TyInfer(_) => bug!("I got an incomplete type for validation"),
@ -611,6 +611,15 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
let val = self.read_lvalue(lvalue)?;
self.validate_ptr(val, ty.boxed_ty(), vctx)
}
TyFnPtr(_sig) => {
// TODO: The function names here could need some improvement.
let ptr = self.read_lvalue(lvalue)?.into_ptr(&mut self.memory)?.to_ptr()?;
self.memory.get_fn(ptr)?;
// TODO: Check if the signature matches (should be the same check as what terminator/mod.rs already does on call?).
Ok(())
}
// Compound types
TySlice(elem_ty) => {
let len = match lvalue {
Lvalue::Ptr { extra: LvalueExtra::Length(len), .. } => len,
@ -629,13 +638,6 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
}
Ok(())
}
TyFnPtr(_sig) => {
// TODO: The function names here could need some improvement.
let ptr = self.read_lvalue(lvalue)?.into_ptr(&mut self.memory)?.to_ptr()?;
self.memory.get_fn(ptr)?;
// TODO: Check if the signature matches (should be the same check as what terminator/mod.rs already does on call?).
Ok(())
}
TyAdt(adt, subst) => {
match adt.adt_kind() {
AdtKind::Enum => {
@ -682,6 +684,8 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
let field_lvalue = self.lvalue_field(lvalue, idx, ty, field_ty)?;
self.validate(field_lvalue, field_ty, vctx)?;
}
// TODO: Check if the signature matches (should be the same check as what terminator/mod.rs already does on call?).
// Is there other things we can/should check? Like vtable pointers?
Ok(())
}
_ => bug!("We already establishd that this is a type we support.")