mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sprinkle some asserts through trans_uniq

Browse Source
This commit is contained in:
Brian Anderson 2011-09-22 12:07:38 -07:00
parent 8492eed137
commit c4f02a7925
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2028,6 +2028,13 @@ fn copy_val_no_check(cx: @block_ctxt, action: copy_action, dst: ValueRef,
Store(bcx, src, dst);
ret take_ty(bcx, dst, t);
}
if ty::type_is_unique_box(ccx.tcx, t) {
let bcx = cx;
// FIXME (409): Write a test and uncomment
//if action == DROP_EXISTING { bcx = drop_ty(cx, dst, t); }
//ret trans_uniq::copy_val(bcx, dst, src, t);
fail;
}
if type_is_structural_or_param(ccx.tcx, t) || ty::type_is_vec(ccx.tcx, t)
{
let bcx = cx;

7
src/comp/middle/trans_uniq.rs
View File

@ -25,6 +25,7 @@ fn trans_uniq(cx: @block_ctxt, contents: @ast::expr,
bcx = lv.bcx;
let uniq_ty = node_id_type(bcx_ccx(cx), node_id);
assert ty::type_is_unique_box(bcx_tcx(cx), uniq_ty);
let {bcx, val: llptr} = alloc_uniq(bcx, uniq_ty);
bcx = move_val_if_temp(bcx, INIT, llptr, lv,
@ -34,6 +35,8 @@ fn trans_uniq(cx: @block_ctxt, contents: @ast::expr,
}
fn alloc_uniq(cx: @block_ctxt, uniq_ty: ty::t) -> result {
assert ty::type_is_unique_box(bcx_tcx(cx), uniq_ty);
let bcx = cx;
let contents_ty = content_ty(bcx, uniq_ty);
let r = size_of(bcx, contents_ty);
@ -52,6 +55,8 @@ fn alloc_uniq(cx: @block_ctxt, uniq_ty: ty::t) -> result {
}
fn make_free_glue(bcx: @block_ctxt, v: ValueRef, t: ty::t) -> @block_ctxt {
assert ty::type_is_unique_box(bcx_tcx(bcx), 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, v);
@ -68,6 +73,8 @@ fn make_free_glue(bcx: @block_ctxt, v: ValueRef, t: ty::t) -> @block_ctxt {
}
fn content_ty(bcx: @block_ctxt, t: ty::t) -> ty::t {
assert ty::type_is_unique_box(bcx_tcx(bcx), t);
alt ty::struct(bcx_tcx(bcx), t) {
ty::ty_uniq({ty: ct, _}) { ct }
}