OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Call drop glue on the thing in a unique box 

Issue #409
This commit is contained in:
Brian Anderson 2011-09-21 17:41:42 -07:00
parent aad1342e13
commit 4d088bd528
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/comp/middle/trans.rs
View File

@ -1313,7 +1313,21 @@ fn make_free_glue(bcx: @block_ctxt, v0: ValueRef, t: ty::t) {
trans_non_gc_free(bcx, v)
} else { bcx }
}
ty::ty_uniq(_) { fail "free uniq unimplemented"; }
ty::ty_uniq(content_t) {
let free_cx = new_sub_block_ctxt(bcx, "uniq_free");
let next_cx = new_sub_block_ctxt(bcx, "uniq_free_next");
let vptr = Load(bcx, v0);
let null_test = IsNull(bcx, vptr);
CondBr(bcx, null_test, next_cx.llbb, free_cx.llbb);
let bcx = free_cx;
let bcx = drop_ty(bcx, vptr, content_t);
let bcx = trans_shared_free(bcx, vptr);
Store(bcx, C_null(val_ty(vptr)), v0);
Br(bcx, next_cx.llbb);
next_cx
}
ty::ty_obj(_) {
// Call through the obj's own fields-drop glue first.
// Then free the body.
@ -1366,10 +1380,7 @@ fn make_drop_glue(bcx: @block_ctxt, v0: ValueRef, t: ty::t) {
ty::ty_str. { tvec::make_drop_glue(bcx, v0, t) }
ty::ty_box(_) { decr_refcnt_maybe_free(bcx, v0, v0, t) }
ty::ty_uniq(_) {
let vptr = Load(bcx, v0);
let bcx = trans_shared_free(bcx, vptr);
Store(bcx, C_null(val_ty(vptr)), v0);
bcx
free_ty(bcx, v0, t)
}
ty::ty_obj(_) {
let box_cell =

3
src/test/run-pass/unique-drop-complex.rs Normal file
View File

@ -0,0 +1,3 @@
fn main() {
let x = ~[0,0,0,0,0];
}