Last active
June 1, 2017 23:01
-
-
Save RalfJung/d3fc1c1c292f377edb9f94c4d4f68ce9 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/librustc_mir/util/elaborate_drops.rs b/src/librustc_mir/util/elaborate_drops.rs | |
index 50ebe36638..aee03bae01 100644 | |
--- a/src/librustc_mir/util/elaborate_drops.rs | |
+++ b/src/librustc_mir/util/elaborate_drops.rs | |
@@ -673,7 +673,7 @@ impl<'l, 'b, 'tcx, D> DropCtxt<'l, 'b, 'tcx, D> | |
debug!("drop_loop_pair({:?}, {:?})", ety, ptr_based); | |
let tcx = self.tcx(); | |
let iter_ty = if ptr_based { | |
- tcx.mk_ptr(ty::TypeAndMut { ty: ety, mutbl: hir::Mutability::MutMutable }) | |
+ tcx.mk_mut_ptr(ety) | |
} else { | |
tcx.types.usize | |
}; | |
@@ -708,15 +708,20 @@ impl<'l, 'b, 'tcx, D> DropCtxt<'l, 'b, 'tcx, D> | |
let mut drop_block_stmts = vec![]; | |
drop_block_stmts.push(self.assign(&length, Rvalue::Len(self.lvalue.clone()))); | |
if ptr_based { | |
- // cur = &LV[0]; | |
+ let tmp_ty = tcx.mk_mut_ptr(self.lvalue_ty(self.lvalue)); | |
+ let tmp = Lvalue::Local(self.new_temp(tmp_ty)); | |
+ // tmp = &LV; | |
+ // cur = tmp as *const T; | |
// end = &LV[len]; | |
- drop_block_stmts.push(self.assign(&cur, Rvalue::Ref( | |
- tcx.types.re_erased, BorrowKind::Mut, | |
- self.lvalue.clone().index(zero.clone()) | |
+ drop_block_stmts.push(self.assign(&tmp, Rvalue::Ref( | |
+ tcx.types.re_erased, BorrowKind::Mut, self.lvalue.clone() | |
))); | |
- drop_block_stmts.push(self.assign(&length_or_end, Rvalue::Ref( | |
- tcx.types.re_erased, BorrowKind::Mut, | |
- self.lvalue.clone().index(Operand::Consume(length.clone())) | |
+ drop_block_stmts.push(self.assign(&cur, Rvalue::Cast( | |
+ CastKind::Misc, Operand::Consume(tmp.clone()), iter_ty | |
+ ))); | |
+ drop_block_stmts.push(self.assign(&length_or_end, | |
+ Rvalue::BinaryOp(BinOp::Offset, | |
+ Operand::Consume(cur.clone()), Operand::Consume(length.clone()) | |
))); | |
} else { | |
// index = 0 (length already pushed) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment