user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Impl-ize interner.

Browse source
This commit is contained in:
Paul Stansifer 2012-07-17 11:22:11 -07:00
parent a7125971c6
commit e040ab8423
7 changed files with 52 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/rustc/middle/trans/shape.rs
View file

@ -335,7 +335,7 @@ fn shape_of(ccx: @crate_ctxt, t: ty::t) -> ~[u8] {
else { ~[shape_struct] }, sub = ~[];
do option::iter(m_dtor_did) |dtor_did| {
let ri = @{did: dtor_did, parent_id: some(did), tps: tps};
let id = interner::intern(ccx.shape_cx.resources, ri);
let id = ccx.shape_cx.resources.intern(ri);
add_u16(s, id as u16);
};
for ty::class_items_as_mutable_fields(ccx.tcx, did, substs).each |f| {
@ -569,9 +569,9 @@ fn gen_enum_shapes(ccx: @crate_ctxt) -> ValueRef {
fn gen_resource_shapes(ccx: @crate_ctxt) -> ValueRef {
let mut dtors = ~[];
let len = interner::len(ccx.shape_cx.resources);
let len = ccx.shape_cx.resources.len();
for uint::range(0u, len) |i| {
let ri = interner::get(ccx.shape_cx.resources, i);
let ri = ccx.shape_cx.resources.get(i);
for ri.tps.each() |s| { assert !ty::type_has_params(s); }
do option::iter(ri.parent_id) |id| {
dtors += ~[trans::base::get_res_dtor(ccx, ri.did, id, ri.tps)];