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

More const eval sanity checks (invalid slice fat pointers)

Browse source
This commit is contained in:
Oliver Schneider 2018-01-23 16:37:39 +01:00
parent f14e746b2f
commit d3e2f48c8c
No known key found for this signature in database
GPG key ID: A69F8D225B3AD7D9
2 changed files with 11 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/librustc_mir/build/matches/test.rs
View file

@ -173,39 +173,6 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
}
}
/// Convert a byte array or byte slice to a byte slice.
fn to_slice_operand(&mut self,
block: BasicBlock,
source_info: SourceInfo,
operand: Operand<'tcx>)
-> Operand<'tcx>
{
let tcx = self.hir.tcx();
let ty = operand.ty(&self.local_decls, tcx);
debug!("to_slice_operand({:?}, {:?}: {:?})", block, operand, ty);
match ty.sty {
ty::TyRef(region, mt) => match mt.ty.sty {
ty::TyArray(ety, _) => {
let ty = tcx.mk_imm_ref(region, tcx.mk_slice(ety));
let temp = self.temp(ty, source_info.span);
self.cfg.push_assign(block, source_info, &temp,
Rvalue::Cast(CastKind::Unsize, operand, ty));
Operand::Move(temp)
}
ty::TySlice(_) => operand,
_ => {
span_bug!(source_info.span,
"bad operand {:?}: {:?} to `to_slice_operand`", operand, ty)
}
}
_ => {
span_bug!(source_info.span,
"bad operand {:?}: {:?} to `to_slice_operand`", operand, ty)
}
}
}
/// Generates the code to perform a test.
pub fn perform_test(&mut self,
block: BasicBlock,
@ -292,8 +259,7 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
ret
}
TestKind::Eq { value, ty } => {
let tcx = self.hir.tcx();
TestKind::Eq { value, mut ty } => {
let mut val = Operand::Copy(place.clone());
let mut expect = self.literal_operand(test.span, ty, Literal::Value {
value

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

@ -1263,9 +1263,16 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M
ty::TyDynamic(..) => Ok(p.to_value_with_vtable(
self.memory.read_ptr_sized_unsigned(extra, ptr_align)?.to_ptr()?,
)),
ty::TySlice(..) | ty::TyStr => Ok(
p.to_value_with_len(self.memory.read_ptr_sized_unsigned(extra, ptr_align)?.to_bytes()? as u64),
),
ty::TySlice(..) | ty::TyStr => {
match p.primval {
PrimVal::Bytes(b) => bug!("slice ptr: {:x}", b),
PrimVal::Undef => bug!("undef slice ptr"),
_ => {},
}
Ok(
p.to_value_with_len(self.memory.read_ptr_sized_unsigned(extra, ptr_align)?.to_bytes()? as u64),
)
},
_ => bug!("unsized primval ptr read from {:?}", pointee_ty),
}
}