nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make vectors contain the right type descriptor. Closes #2536.

Browse Source
This commit is contained in:
Michael Sullivan 2012-06-12 14:54:02 -07:00
parent 4f61dcb026
commit ccf4e8cf9a
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/rustc/middle/trans/tvec.rs
View File

@ -57,17 +57,14 @@ fn alloc_uniq_raw(bcx: block, unit_ty: ty::t,
fill: ValueRef, alloc: ValueRef) -> result {
let _icx = bcx.insn_ctxt("tvec::alloc_uniq_raw");
let ccx = bcx.ccx();
let llunitty = type_of::type_of(ccx, unit_ty);
let llvecty = T_vec(ccx, llunitty);
let vecsize = Add(bcx, alloc, llsize_of(ccx, llvecty));
let vecbodyty = unit_ty; // FIXME: This is not the correct type (#2536)
let vecbodyty = ty::mk_mut_unboxed_vec(bcx.tcx(), unit_ty);
let vecsize = Add(bcx, alloc, llsize_of(ccx, ccx.opaque_vec_type));
let {box, body} = base::malloc_unique_dyn(bcx, vecbodyty, vecsize);
let boxptr = PointerCast(bcx, box,
T_unique_ptr(T_unique(bcx.ccx(), llvecty)));
let bodyptr = PointerCast(bcx, body, T_ptr(llvecty));
Store(bcx, fill, GEPi(bcx, bodyptr, [0u, abi::vec_elt_fill]));
Store(bcx, alloc, GEPi(bcx, bodyptr, [0u, abi::vec_elt_alloc]));
ret {bcx: bcx, val: boxptr};
Store(bcx, fill, GEPi(bcx, body, [0u, abi::vec_elt_fill]));
Store(bcx, alloc, GEPi(bcx, body, [0u, abi::vec_elt_alloc]));
ret {bcx: bcx, val: box};
}
fn alloc_uniq(bcx: block, unit_ty: ty::t, elts: uint) -> result {
@ -91,14 +88,9 @@ fn duplicate_uniq(bcx: block, vptr: ValueRef, vec_ty: ty::t) -> result {
let size = Add(bcx, fill, llsize_of(ccx, ccx.opaque_vec_type));
let unit_ty = ty::sequence_element_type(bcx.tcx(), vec_ty);
let llunitty = type_of::type_of(ccx, unit_ty);
let llvecty = T_vec(ccx, llunitty);
let vecbodyty = unit_ty; // FIXME: This is not the correct type (#2536)
let vecbodyty = ty::mk_mut_unboxed_vec(bcx.tcx(), unit_ty);
let {box: newptr, body: new_body_ptr} =
base::malloc_unique_dyn(bcx, vecbodyty, size);
let newptr = PointerCast(bcx, newptr,
T_unique_ptr(T_unique(bcx.ccx(), llvecty)));
let new_body_ptr = PointerCast(bcx, new_body_ptr, T_ptr(llvecty));
call_memmove(bcx, new_body_ptr, body_ptr, size);
Store(bcx, fill, GEPi(bcx, new_body_ptr, [0u, abi::vec_elt_alloc]));

5
src/rustc/middle/ty.rs
View File

@ -88,7 +88,7 @@ export ty_str, mk_str, type_is_str;
export ty_vec, mk_vec, type_is_vec;
export ty_estr, mk_estr;
export ty_evec, mk_evec;
export ty_unboxed_vec, mk_unboxed_vec;
export ty_unboxed_vec, mk_unboxed_vec, mk_mut_unboxed_vec;
export vstore, vstore_fixed, vstore_uniq, vstore_box, vstore_slice;
export ty_nil, mk_nil, type_is_nil;
export ty_iface, mk_iface;
@ -677,6 +677,9 @@ fn mk_evec(cx: ctxt, tm: mt, t: vstore) -> t {
fn mk_unboxed_vec(cx: ctxt, tm: mt) -> t {
mk_t(cx, ty_unboxed_vec(tm))
}
fn mk_mut_unboxed_vec(cx: ctxt, ty: t) -> t {
mk_t(cx, ty_unboxed_vec({ty: ty, mutbl: ast::m_imm}))
}
fn mk_rec(cx: ctxt, fs: [field]) -> t { mk_t(cx, ty_rec(fs)) }