Skip to content
Snippets Groups Projects
Commit 40361afe authored by David Renshaw's avatar David Renshaw
Browse files

minor simplification

parent f2d895a6
No related branches found
No related tags found
No related merge requests found
...@@ -355,8 +355,10 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> { ...@@ -355,8 +355,10 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
extra: LvalueExtra::None, extra: LvalueExtra::None,
}) })
} else { } else {
let ptr_primval = match (base_ptr.to_ptr(), elem_size) { let ptr_primval = if elem_size == 0 {
(Ok(p), _) => { base_ptr
} else {
let p = base_ptr.to_ptr()?;
let byte_index = self.memory.constraints.add_binop_constraint( let byte_index = self.memory.constraints.add_binop_constraint(
mir::BinOp::Mul, mir::BinOp::Mul,
idx, idx,
...@@ -369,9 +371,6 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> { ...@@ -369,9 +371,6 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
byte_index, byte_index,
PrimValKind::U64); PrimValKind::U64);
PrimVal::Ptr(Pointer::with_primval_offset(p.alloc_id, offset)) PrimVal::Ptr(Pointer::with_primval_offset(p.alloc_id, offset))
}
(Err(_), 0) => base_ptr,
(Err(e), _) => return Err(e),
}; };
Ok(Lvalue::Ptr { Ok(Lvalue::Ptr {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment