1
Fork 0

Remove unused eval_operand_and_layout fn.

This commit is contained in:
Scott Olson 2016-04-23 20:46:27 -06:00
parent 500cd25627
commit 3fd2ee9ddc

View file

@ -741,23 +741,14 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
}
fn eval_operand(&mut self, op: &mir::Operand<'tcx>) -> EvalResult<Pointer> {
self.eval_operand_and_layout(op).map(|(p, _)| p)
}
fn eval_operand_and_layout(&mut self, op: &mir::Operand<'tcx>)
-> EvalResult<(Pointer, &'tcx Layout)>
{
use rustc::mir::repr::Operand::*;
match *op {
Consume(ref lvalue) =>
Ok((try!(self.eval_lvalue(lvalue)).to_ptr(), self.lvalue_layout(lvalue))),
Ok(try!(self.eval_lvalue(lvalue)).to_ptr()),
Constant(mir::Constant { ref literal, ty, .. }) => {
use rustc::mir::repr::Literal::*;
match *literal {
Value { ref value } => Ok((
try!(self.const_to_ptr(value)),
self.type_layout(ty),
)),
Value { ref value } => Ok(try!(self.const_to_ptr(value))),
Item { .. } => unimplemented!(),
}
}