OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix breakage

Browse Source
This commit is contained in:
Tim Chevalier 2012-03-23 20:53:38 -07:00
parent 8bbd78075f
commit 40443768b1
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rustc/middle/trans/base.rs
View File

@ -4248,13 +4248,11 @@ fn trans_item(ccx: @crate_ctxt, item: ast::item) {
// We *don't* want self to be passed to the ctor -- that
// wouldn't make sense
// So we initialize it here
let {bcx, val} = alloc_ty(bcx_top, rslt_ty);
let mut bcx = bcx;
let selfptr = val;
let selfptr = alloc_ty(bcx_top, rslt_ty);
fcx.llself = some({v: selfptr, t: rslt_ty});
// Translate the body of the ctor
bcx = trans_block(bcx_top, ctor.node.body, ignore);
let mut bcx = trans_block(bcx_top, ctor.node.body, ignore);
let lval_res = {bcx: bcx, val: selfptr, kind: owned};
// Generate the return expression
bcx = store_temp_expr(bcx, INIT, fcx.llretptr, lval_res,

2
src/rustc/middle/trans/native.rs
View File

@ -755,7 +755,7 @@ fn trans_native_mod(ccx: @crate_ctxt,
fn trans_intrinsic(ccx: @crate_ctxt, decl: ValueRef, item: @ast::native_item,
path: ast_map::path, substs: param_substs,
ref_id: option<ast::node_id>) {
let fcx = new_fn_ctxt_w_id(ccx, path, decl, item.id, none,
let fcx = new_fn_ctxt_w_id(ccx, path, decl, item.id,
some(substs), some(item.span));
let bcx = top_scope_block(fcx, none), lltop = bcx.llbb;
let tp_ty = substs.tys[0], lltp_ty = type_of::type_of(ccx, tp_ty);