rustc_mir: promote borrows' underlying temps, and project at runtime.

diff --git a/src/librustc_mir/transform/promote_consts.rs b/src/librustc_mir/transform/promote_consts.rs
index fb7eb60545c976c82bedf4c69d29e5b34ea774c9..5af19ab36469677e2a01a3e56adc3d25d634ac45 100644 (file)
--- a/src/librustc_mir/transform/promote_consts.rs
+++ b/src/librustc_mir/transform/promote_consts.rs
@@ -309,6 +309,18 @@ fn promote_candidate(mut self, candidate: Candidate) {
                     let ref mut statement = blocks[loc.block].statements[loc.statement_index];
                     match statement.kind {
                         StatementKind::Assign(_, Rvalue::Ref(r, bk, ref mut place)) => {
+                            // Find the underlying local for this (necessarilly interior) borrow.
+                            // HACK(eddyb) using a recursive function because of mutable borrows.
+                            fn interior_base<'a, 'tcx>(place: &'a mut Place<'tcx>)
+                                                       -> &'a mut Place<'tcx> {
+                                if let Place::Projection(ref mut proj) = *place {
+                                    assert_ne!(proj.elem, ProjectionElem::Deref);
+                                    return interior_base(&mut proj.base);
+                                }
+                                place
+                            }
+                            let place = interior_base(place);
+
                             let ty = place.ty(local_decls, self.tcx).to_ty(self.tcx);
                             let ref_ty = self.tcx.mk_ref(r,
                                 ty::TypeAndMut {