bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustc: Truncate or zero-extend indexes appropriately. Un-XFAIL integral-indexing.rs.

Browse source
This commit is contained in:
Patrick Walton 2011-03-07 15:43:55 -08:00
parent df3038e68b
commit 6f7e21ddac
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Makefile
View file

@ -456,7 +456,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
generic-recursive-tag.rs \ generic-recursive-tag.rs \
generic-tag-alt.rs \ generic-tag-alt.rs \
generic-tag-values.rs \ generic-tag-values.rs \
integral-indexing.rs \
iter-range.rs \ iter-range.rs \
iter-ret.rs \ iter-ret.rs \
lazychan.rs \ lazychan.rs \

17
src/comp/middle/trans.rs
View file

@ -3209,10 +3209,23 @@ fn trans_index(@block_ctxt cx, &ast.span sp, @ast.expr base,
auto v = lv.val; auto v = lv.val;
auto bcx = ix.bcx; auto bcx = ix.bcx;
// Cast to an LLVM integer. Rust is less strict than LLVM in this regard.
auto ix_val;
auto ix_size = llsize_of_real(cx.fcx.ccx, val_ty(ix.val));
auto int_size = llsize_of_real(cx.fcx.ccx, T_int());
if (ix_size < int_size) {
ix_val = bcx.build.ZExt(ix.val, T_int());
} else if (ix_size > int_size) {
ix_val = bcx.build.Trunc(ix.val, T_int());
} else {
ix_val = ix.val;
}
auto llunit_ty = node_type(cx.fcx.ccx, ann); auto llunit_ty = node_type(cx.fcx.ccx, ann);
auto unit_sz = size_of(bcx, node_ann_type(cx.fcx.ccx, ann)); auto unit_sz = size_of(bcx, node_ann_type(cx.fcx.ccx, ann));
bcx = unit_sz.bcx; bcx = unit_sz.bcx;
auto scaled_ix = bcx.build.Mul(ix.val, unit_sz.val);
auto scaled_ix = bcx.build.Mul(ix_val, unit_sz.val);
auto lim = bcx.build.GEP(v, vec(C_int(0), C_int(abi.vec_elt_fill))); auto lim = bcx.build.GEP(v, vec(C_int(0), C_int(abi.vec_elt_fill)));
lim = bcx.build.Load(lim); lim = bcx.build.Load(lim);
@ -3229,7 +3242,7 @@ fn trans_index(@block_ctxt cx, &ast.span sp, @ast.expr base,
fail_res.bcx.build.Br(next_cx.llbb); fail_res.bcx.build.Br(next_cx.llbb);
auto body = next_cx.build.GEP(v, vec(C_int(0), C_int(abi.vec_elt_data))); auto body = next_cx.build.GEP(v, vec(C_int(0), C_int(abi.vec_elt_data)));
auto elt = next_cx.build.GEP(body, vec(C_int(0), ix.val)); auto elt = next_cx.build.GEP(body, vec(C_int(0), ix_val));
ret lval_mem(next_cx, elt); ret lval_mem(next_cx, elt);
} }