Auto merge of #28020 - dotdash:ref_fat_ptr_be_gone, r=eddyb
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:
commit
ab21fe59e9
1 changed files with 1 additions and 8 deletions
|
@ -390,14 +390,7 @@ fn apply_adjustments<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
|
||||||
// (You might think there is a more elegant way to do this than a
|
// (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).
|
// skip_reborrows bool, but then you remember that the borrow checker exists).
|
||||||
if skip_reborrows == 0 && adj.autoref.is_some() {
|
if skip_reborrows == 0 && adj.autoref.is_some() {
|
||||||
if !type_is_sized(bcx.tcx(), datum.ty) {
|
datum = unpack_datum!(bcx, auto_ref(bcx, datum, expr));
|
||||||
// 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 {
|
if let Some(target) = adj.unsize {
|
||||||
|
|
Loading…
Reference in a new issue