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

handle type of function definitions (98)

Browse source
This commit is contained in:
Ralf Jung 2017-07-14 09:05:10 -07:00 • committed by Oliver Schneider
parent 3f8a497bf0
commit 4aae2e766e
No known key found for this signature in database
GPG key ID: A69F8D225B3AD7D9
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/librustc_mir/interpret/validation.rs
View file

@ -80,11 +80,10 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
let is_owning = match ty.sty {
TyInt(_) | TyUint(_) | TyRawPtr(_) |
TyBool | TyFloat(_) | TyChar | TyStr |
TyRef(..) | TyFnPtr(..) | TyNever => true,
TyRef(..) | TyFnPtr(..) | TyFnDef(..) | TyNever => true,
TyAdt(adt, _) if adt.is_box() => true,
TySlice(_) | TyAdt(_, _) | TyTuple(..) | TyClosure(..) | TyArray(..) | TyDynamic(..) => false,
TyParam(_) | TyInfer(_) => bug!("I got an incomplete type for validation"),
_ => return Err(EvalError::Unimplemented(format!("Unimplemented type encountered when checking validity."))),
TyParam(_) | TyInfer(_) | TyProjection(_) | TyAnon(..) | TyError => bug!("I got an incomplete/unnormalized type for validation"),
};
if is_owning {
match lvalue {
@ -163,12 +162,16 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
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(())
}
TyFnDef(..) => {
// This is a zero-sized type with all relevant data sitting in the type.
// There is nothing to validate.
Ok(())
}
// Compound types
TySlice(elem_ty) => {