bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Simplify the char correctness check

Browse source
This commit is contained in:
Oliver Schneider 2018-07-30 15:42:11 +02:00
parent d0b315f262
commit 32eb10f54d
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustc_mir/interpret/eval_context.rs
View file

@ -1365,11 +1365,9 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M
// has no special checks for chars
match ty.sty {
ty::TyChar => {
assert_eq!(size.bytes(), 4);
let c = self.memory.read_scalar(ptr, ptr_align, Size::from_bytes(4))?.read()?.to_bits(Size::from_bytes(4))? as u32;
match ::std::char::from_u32(c) {
Some(..) => (),
None => return err!(InvalidChar(c as u128)),
debug_assert_eq!(size.bytes(), 4);
if ::std::char::from_u32(bits as u32).is_none() {
return err!(InvalidChar(bits));
}
}
_ => {},