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 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Null-check on obj box ptr, init to null. Un-XFAIL simple-obj.rs.

Browse Source
This commit is contained in:
Graydon Hoare 2010-12-20 17:28:07 -08:00
parent 399929ba0b
commit ed1dddc33f
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile
View File

@ -553,6 +553,7 @@ TEST_XFAILS_SELF := $(filter-out \
rec-auto.rs \
rec-tup.rs \
return-nil.rs \
simple-obj.rs \
type-in-nested-module.rs \
tup.rs \
u32-decr.rs \

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

@ -812,6 +812,23 @@ fn iter_structural_ty(@block_ctxt cx,
-> result {
let result r = res(cx, C_nil());
fn iter_boxpp(@block_ctxt cx,
ValueRef box_cell,
val_and_ty_fn f) -> result {
auto box_ptr = cx.build.Load(box_cell);
auto tnil = typeck.plain_ty(typeck.ty_nil);
auto tbox = typeck.plain_ty(typeck.ty_box(tnil));
auto inner_cx = new_sub_block_ctxt(cx, "iter box");
auto next_cx = new_sub_block_ctxt(cx, "next");
auto null_test = cx.build.IsNull(box_ptr);
cx.build.CondBr(null_test, next_cx.llbb, inner_cx.llbb);
auto r = f(inner_cx, box_ptr, tbox);
r.bcx.build.Br(next_cx.llbb);
ret res(next_cx, r.val);
}
alt (t.struct) {
case (typeck.ty_tup(?args)) {
let int i = 0;
@ -919,20 +936,14 @@ fn iter_structural_ty(@block_ctxt cx,
cx.build.GEP(v,
vec(C_int(0),
C_int(abi.fn_field_box)));
auto box_ptr = cx.build.Load(box_cell);
auto tnil = typeck.plain_ty(typeck.ty_nil);
auto tbox = typeck.plain_ty(typeck.ty_box(tnil));
ret f(cx, box_ptr, tbox);
ret iter_boxpp(cx, box_cell, f);
}
case (typeck.ty_obj(_)) {
auto box_cell =
cx.build.GEP(v,
vec(C_int(0),
C_int(abi.obj_field_box)));
auto box_ptr = cx.build.Load(box_cell);
auto tnil = typeck.plain_ty(typeck.ty_nil);
auto tbox = typeck.plain_ty(typeck.ty_box(tnil));
ret f(cx, box_ptr, tbox);
ret iter_boxpp(cx, box_cell, f);
}
case (_) {
cx.fcx.ccx.sess.unimpl("type in iter_structural_ty");
@ -2447,7 +2458,14 @@ impure fn trans_obj(@crate_ctxt cx, &ast._obj ob, ast.def_id oid,
auto pair_vtbl = bcx.build.GEP(pair,
vec(C_int(0),
C_int(abi.obj_field_vtbl)));
auto pair_box = bcx.build.GEP(pair,
vec(C_int(0),
C_int(abi.obj_field_box)));
bcx.build.Store(vtbl, pair_vtbl);
// FIXME: allocate the object body, copy the args in, etc.
bcx.build.Store(C_null(T_ptr(T_box(T_nil()))), pair_box);
bcx.build.Ret(bcx.build.Load(pair));
}