MIR: split Operand::Consume into Copy and Move.

[rust.git] / src / librustc_mir / transform / add_validation.rs

diff --git a/src/librustc_mir/transform/add_validation.rs b/src/librustc_mir/transform/add_validation.rs
index c6f2154eaa471e34f29114934b91a816a008b8ce..6021955004e6407cf72b50bed822c94af1c95de4 100644 (file)
--- a/src/librustc_mir/transform/add_validation.rs
+++ b/src/librustc_mir/transform/add_validation.rs
@@ -260,7 +260,8 @@ fn run_pass<'a, 'tcx>(&self,
                                 .chain(
                                     args.iter().filter_map(|op| {
                                         match op {
-                                            &Operand::Consume(ref lval) =>
+                                            &Operand::Copy(ref lval) |
+                                            &Operand::Move(ref lval) =>
                                                 Some(lval_to_operand(lval.clone())),
                                             &Operand::Constant(..) => { None },
                                         }
@@ -353,14 +354,17 @@ fn run_pass<'a, 'tcx>(&self,
                         block_data.statements.insert(i, release_stmt);
                     }
                     // Casts can change what validation does (e.g. unsizing)
-                    StatementKind::Assign(_, Rvalue::Cast(kind, Operand::Consume(_), _))
+                    StatementKind::Assign(_, Rvalue::Cast(kind, Operand::Copy(_), _)) |
+                    StatementKind::Assign(_, Rvalue::Cast(kind, Operand::Move(_), _))
                         if kind != CastKind::Misc =>
                     {
                         // Due to a lack of NLL; we can't capture anything directly here.
                         // Instead, we have to re-match and clone there.
                         let (dest_lval, src_lval) = match block_data.statements[i].kind {
                             StatementKind::Assign(ref dest_lval,
-                                    Rvalue::Cast(_, Operand::Consume(ref src_lval), _)) =>
+                                    Rvalue::Cast(_, Operand::Copy(ref src_lval), _)) |
+                            StatementKind::Assign(ref dest_lval,
+                                    Rvalue::Cast(_, Operand::Move(ref src_lval), _)) =>
                             {
                                 (dest_lval.clone(), src_lval.clone())
                             },