Skip to content

Commit b9a92a3

Browse files
committed
---
yaml --- r: 273433 b: refs/heads/beta c: dd99f58 h: refs/heads/master i: 273431: c20aba5
1 parent 9a2521a commit b9a92a3

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 5508c40d0494fbb2f5e83a4bb37d86cb0c04c76e
26+
refs/heads/beta: dd99f58fe15134b42c6f74225107a08f267046f2
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_borrowck/borrowck/mir/gather_moves.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,11 @@ fn gather_moves<'tcx>(mir: &Mir<'tcx>, tcx: &ty::TyCtxt<'tcx>) -> MoveData<'tcx>
554554
Rvalue::Box(ref _ty) => {
555555
// this is creating uninitialized
556556
// memory that needs to be initialized.
557-
bb_ctxt.on_move_out_lval(SK::Box, lval, source);
557+
let deref_lval = Lvalue::Projection(Box::new( repr::Projection {
558+
base: lval.clone(),
559+
elem: repr::ProjectionElem::Deref,
560+
}));
561+
bb_ctxt.on_move_out_lval(SK::Box, &deref_lval, source);
558562
}
559563
Rvalue::Aggregate(ref _kind, ref operands) => {
560564
for operand in operands {

0 commit comments

Comments
 (0)