Skip to content

Commit

Permalink
Schedule cleanup for &* on fat owned pointers
Browse files Browse the repository at this point in the history
For example `let _x: &Trait = &*(box Foo as Box<Trait>);`. There was a bug where no cleanup would be scheduled by the deref.

No test because cleanup-auto-borrow-obj.rs is a test for this once we remove trait cross-borrowing (done on another branch).
  • Loading branch information
nrc committed Sep 2, 2014
1 parent dfbd466 commit e9bd650
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
2 changes: 2 additions & 0 deletions src/librustc/middle/trans/datum.rs
Expand Up @@ -451,6 +451,8 @@ impl Datum<Expr> {
name: &str,
expr_id: ast::NodeId)
-> DatumBlock<'a, Lvalue> {
debug!("to_lvalue_datum self: {}", self.to_string(bcx.ccx()));

assert!(ty::lltype_is_sized(bcx.tcx(), self.ty),
"Trying to convert unsized value to lval");
self.match_kind(
Expand Down
18 changes: 12 additions & 6 deletions src/librustc/middle/trans/expr.rs
Expand Up @@ -2061,11 +2061,17 @@ fn deref_once<'a>(bcx: &'a Block<'a>,
if ty::type_is_sized(bcx.tcx(), content_ty) {
deref_owned_pointer(bcx, expr, datum, content_ty)
} else {
// A fat pointer and an opened DST value have the same represenation
// just different types.
DatumBlock::new(bcx, Datum::new(datum.val,
ty::mk_open(bcx.tcx(), content_ty),
datum.kind))
// A fat pointer and an opened DST value have the same
// represenation just different types. Since there is no
// temporary for `*e` here (because it is unsized), we cannot
// emulate the sized object code path for running drop glue and
// free. Instead, we schedule cleanup for `e`, turning it into
// an lvalue.
let datum = unpack_datum!(
bcx, datum.to_lvalue_datum(bcx, "deref", expr.id));

let datum = Datum::new(datum.val, ty::mk_open(bcx.tcx(), content_ty), LvalueExpr);
DatumBlock::new(bcx, datum)
}
}

Expand Down Expand Up @@ -2094,7 +2100,7 @@ fn deref_once<'a>(bcx: &'a Block<'a>,
// just different types.
DatumBlock::new(bcx, Datum::new(datum.val,
ty::mk_open(bcx.tcx(), content_ty),
datum.kind))
LvalueExpr))
}
}

Expand Down

0 comments on commit e9bd650

Please sign in to comment.