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

Make sure trans translates record fields in the order they appear in code

Browse Source 
This prevents surprising side-effect orders, and makes them easier for
the other passes to deal with.
This commit is contained in:
Marijn Haverbeke 2011-11-18 15:59:47 +01:00
parent 68db68c4cc
commit 196b2b920f
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4035,34 +4035,35 @@ fn trans_rec(bcx: @block_ctxt, fields: [ast::field],
save_in(pos) { pos }
};
let base_val = alt base {
some(bexp) {
let base_res = trans_temp_expr(bcx, bexp);
bcx = base_res.bcx;
base_res.val
}
none. { C_nil() }
};
let ty_fields = alt ty::struct(bcx_tcx(bcx), t) { ty::ty_rec(f) { f } };
let temp_cleanups = [], i = 0;
for tf in ty_fields {
let dst = GEP_tup_like_1(bcx, t, addr, [0, i]);
bcx = dst.bcx;
alt vec::find({|f| str::eq(f.node.ident, tf.ident)}, fields) {
some(f) {
bcx = trans_expr_save_in(bcx, f.node.expr, dst.val);
let temp_cleanups = [];
for fld in fields {
let ix = option::get(vec::position_pred({|ft|
str::eq(fld.node.ident, ft.ident)
}, ty_fields));
let dst = GEP_tup_like_1(bcx, t, addr, [0, ix as int]);
bcx = trans_expr_save_in(dst.bcx, fld.node.expr, dst.val);
add_clean_temp_mem(bcx, dst.val, ty_fields[ix].mt.ty);
temp_cleanups += [dst.val];
}
none. {
alt base {
some(bexp) {
let {bcx: cx, val: base_val} = trans_temp_expr(bcx, bexp), i = 0;
bcx = cx;
// Copy over inherited fields
for tf in ty_fields {
if !vec::any({|f| str::eq(f.node.ident, tf.ident)}, fields) {
let dst = GEP_tup_like_1(bcx, t, addr, [0, i]);
let base = GEP_tup_like_1(bcx, t, base_val, [0, i]);
let val = load_if_immediate(base.bcx, base.val, tf.mt.ty);
bcx = copy_val(base.bcx, INIT, dst.val, val, tf.mt.ty);
}
}
add_clean_temp_mem(bcx, dst.val, tf.mt.ty);
temp_cleanups += [dst.val];
i += 1;
}
}
none. {}
};
// Now revoke the cleanups as we pass responsibility for the data
// structure on to the caller
for cleanup in temp_cleanups { revoke_clean(bcx, cleanup); }