From a0fa2048a8a7695ded7e932a6f7acf4182f9ef73 Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonasschievink@gmail.com>
Date: Tue, 27 Sep 2016 00:24:49 +0200
Subject: [PATCH] Ignore local kind in MIR dataflow

---
 .../borrowck/mir/dataflow/sanity_check.rs           | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/librustc_borrowck/borrowck/mir/dataflow/sanity_check.rs b/src/librustc_borrowck/borrowck/mir/dataflow/sanity_check.rs
index a6d8e1fa3c048..5e22d477c5185 100644
--- a/src/librustc_borrowck/borrowck/mir/dataflow/sanity_check.rs
+++ b/src/librustc_borrowck/borrowck/mir/dataflow/sanity_check.rs
@@ -13,7 +13,7 @@ use syntax::ast;
 use syntax_pos::Span;
 
 use rustc::ty::{self, TyCtxt};
-use rustc::mir::repr::{self, Mir, LocalKind};
+use rustc::mir::repr::{self, Mir};
 use rustc_data_structures::indexed_vec::Idx;
 
 use super::super::gather_moves::{MovePathIndex, LookupResult};
@@ -73,15 +73,8 @@ fn each_block<'a, 'tcx, O>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
     };
     assert!(args.len() == 1);
     let peek_arg_lval = match args[0] {
-        repr::Operand::Consume(ref lval) => match *lval {
-             repr::Lvalue::Local(local) if mir.local_kind(local) == LocalKind::Temp => {
-                 Some(lval)
-             }
-             _ => None
-        },
-        repr::Operand::Constant(_) => {
-            None
-        }
+        repr::Operand::Consume(ref lval @ repr::Lvalue::Local(_)) => Some(lval),
+        _ => None,
     };
 
     let peek_arg_lval = match peek_arg_lval {