From 40443768b16747cb3ef90a2fb2fd9e7f317ff383 Mon Sep 17 00:00:00 2001 From: Tim Chevalier Date: Fri, 23 Mar 2012 20:53:38 -0700 Subject: [PATCH] Fix breakage --- src/rustc/middle/trans/base.rs | 6 ++---- src/rustc/middle/trans/native.rs | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/rustc/middle/trans/base.rs b/src/rustc/middle/trans/base.rs index 593cdd228cd..6be5db508f9 100644 --- a/src/rustc/middle/trans/base.rs +++ b/src/rustc/middle/trans/base.rs @@ -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, diff --git a/src/rustc/middle/trans/native.rs b/src/rustc/middle/trans/native.rs index fb9a319971b..908872ee548 100644 --- a/src/rustc/middle/trans/native.rs +++ b/src/rustc/middle/trans/native.rs @@ -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) { - 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);