OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For now, accept all data for integer types when not in const mode

Browse Source 
We'll try ruling out undef later
This commit is contained in:
Ralf Jung 2018-10-03 08:59:27 +02:00
parent 9bb4bcd770
commit 22c1a0acc8
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/librustc_mir/interpret/validity.rs
View File

@ -162,14 +162,18 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M>
scalar_format(value), path, "a valid unicode codepoint");
},
ty::Float(_) | ty::Int(_) | ty::Uint(_) if const_mode => {
// Integers/floats in CTFE: Must be scalar bits
// Integers/floats in CTFE: Must be scalar bits, pointers are dangerous
try_validation!(value.to_bits(size),
scalar_format(value), path, "initialized plain bits");
}
ty::Float(_) | ty::Int(_) | ty::Uint(_) | ty::RawPtr(_) => {
// Anything but undef goes
try_validation!(value.not_undef(),
scalar_format(value), path, "a raw pointer");
if const_mode {
// Anything but undef goes
try_validation!(value.not_undef(),
scalar_format(value), path, "a raw pointer");
} else {
// At run-time, for now, we accept *anything* for these types.
}
},
ty::Ref(..) => {
// This is checked by the recursive reference handling, nothing to do here.
@ -182,10 +186,8 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M>
scalar_format(value), path, "a function pointer");
// FIXME: Check if the signature matches
}
ty::FnDef(..) => {
// This is a zero-sized type with all relevant data sitting in the type.
// There is nothing to validate.
}
// This should be all
ty::Never => bug!("Uninhabited type should have been catched earlier"),
_ => bug!("Unexpected primitive type {}", ty)
}
Ok(())