squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Auto merge of #28020 - dotdash:ref_fat_ptr_be_gone, r=eddyb

Browse source 
r? @eddyb -- we talked about this on IRC a while back but I only now managed to get the change done.
This commit is contained in:
bors 2015-08-27 03:57:21 +00:00
commit ab21fe59e9
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/librustc_trans/trans/expr.rs
View file

@ -390,15 +390,8 @@ fn apply_adjustments<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
// (You might think there is a more elegant way to do this than a
// skip_reborrows bool, but then you remember that the borrow checker exists).
if skip_reborrows == 0 && adj.autoref.is_some() {
if !type_is_sized(bcx.tcx(), datum.ty) {
// Arrange cleanup
let lval = unpack_datum!(bcx,
datum.to_lvalue_datum(bcx, "ref_fat_ptr", expr.id));
datum = unpack_datum!(bcx, ref_fat_ptr(bcx, lval));
} else {
datum = unpack_datum!(bcx, auto_ref(bcx, datum, expr));
}
}
if let Some(target) = adj.unsize {
// We do not arrange cleanup ourselves; if we already are an