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

Auto merge of #46492 - eddyb:move-ops, r=arielb1

Browse Source 
rustc_mir: don't move temporaries that are still used later.

This should unbreak using the MIR borrow-checker on `libcore` (assuming #46268 is merged).
This commit is contained in:
bors 2017-12-05 13:35:59 +00:00
commit bf2be6175e
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc/mir/mod.rs
View File

@ -1347,6 +1347,12 @@ impl<'tcx> Operand<'tcx> {
})
}
pub fn to_copy(&self) -> Self {
match *self {
Operand::Copy(_) | Operand::Constant(_) => self.clone(),
Operand::Move(ref place) => Operand::Copy(place.clone())
}
}
}
///////////////////////////////////////////////////////////////////////////

8
src/librustc_mir/build/expr/as_rvalue.rs
View File

@ -87,7 +87,7 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
let is_min = this.temp(bool_ty, expr_span);
this.cfg.push_assign(block, source_info, &is_min,
Rvalue::BinaryOp(BinOp::Eq, arg.clone(), minval));
Rvalue::BinaryOp(BinOp::Eq, arg.to_copy(), minval));
let err = ConstMathErr::Overflow(Op::Neg);
block = this.assert(block, Operand::Move(is_min), false,
@ -346,7 +346,7 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
let is_zero = self.temp(bool_ty, span);
let zero = self.zero_literal(span, ty);
self.cfg.push_assign(block, source_info, &is_zero,
Rvalue::BinaryOp(BinOp::Eq, rhs.clone(), zero));
Rvalue::BinaryOp(BinOp::Eq, rhs.to_copy(), zero));
block = self.assert(block, Operand::Move(is_zero), false,
AssertMessage::Math(zero_err), span);
@ -364,9 +364,9 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
// this does (rhs == -1) & (lhs == MIN). It could short-circuit instead
self.cfg.push_assign(block, source_info, &is_neg_1,
Rvalue::BinaryOp(BinOp::Eq, rhs.clone(), neg_1));
Rvalue::BinaryOp(BinOp::Eq, rhs.to_copy(), neg_1));
self.cfg.push_assign(block, source_info, &is_min,
Rvalue::BinaryOp(BinOp::Eq, lhs.clone(), min));
Rvalue::BinaryOp(BinOp::Eq, lhs.to_copy(), min));
let is_neg_1 = Operand::Move(is_neg_1);
let is_min = Operand::Move(is_min);

2
src/test/run-pass/i128.rs
View File

@ -10,6 +10,8 @@
// ignore-emscripten i128 doesn't work
// compile-flags: -Z borrowck=compare
#![feature(i128_type, test)]
extern crate test;

2
src/test/run-pass/u128.rs
View File

@ -10,6 +10,8 @@
// ignore-emscripten u128 not supported
// compile-flags: -Z borrowck=compare
#![feature(i128_type, test)]
extern crate test;