Fix a bug in the inliner

oli-obk · web-flow · commit 02fb1b0b724a · 2017-09-06T10:33:53.000+02:00
diff --git a/src/librustc_mir/transform/inline.rs b/src/librustc_mir/transform/inline.rs
@@ -616,8 +616,9 @@ impl<'a, 'tcx> MutVisitor<'tcx> for Integrator<'a, 'tcx> {
                 Operand::Consume(Lvalue::Local(l)) => *local = l,
                 ref op => bug!("Arg operand `{:?}` is {:?}, not local", idx, op)
             }
+        } else {
+            *local = self.local_map[Local::new(idx - self.args.len())];
         }
-        *local = self.local_map[Local::new(idx - self.args.len())];
     }
 
     fn visit_lvalue(&mut self,

Original file line number	Diff line number	Diff line change
`@@ -616,8 +616,9 @@ impl<'a, 'tcx> MutVisitor<'tcx> for Integrator<'a, 'tcx> {`
`616`	`616`	`Operand::Consume(Lvalue::Local(l)) => *local = l,`
`617`	`617`	ref op => bug!("Arg operand `{:?}` is {:?}, not local", idx, op)
`618`	`618`	`}`
	`619`	`+ } else {`
	`620`	`+ *local = self.local_map[Local::new(idx - self.args.len())];`
`619`	`621`	`}`
`620`		`- *local = self.local_map[Local::new(idx - self.args.len())];`
`621`	`622`	`}`
`622`	`623`
`623`	`624`	`fn visit_lvalue(&mut self,`