---

yaml
---
r: 60752
b: refs/heads/auto
c: 6c03fbf
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: a85993ff69d5ba9a2cf07b0d1889b3ddf2e099e5
+refs/heads/auto: 6c03fbfefd950f5a5d54b3b86f84657f9908f5ff
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/librustc/middle/trans/base.rs

@@ -1593,7 +1593,7 @@ pub fn new_fn_ctxt_w_id(ccx: @CrateContext,
                         impl_id: Option<ast::def_id>,
                         param_substs: Option<@param_substs>,
                         sp: Option<span>)
-                     -> (fn_ctxt, bool) {
+                     -> fn_ctxt {
     for param_substs.each |p| { p.validate(); }
 
     debug!("new_fn_ctxt_w_id(path=%s, id=%?, impl_id=%?, \
@@ -1611,21 +1611,19 @@ pub fn new_fn_ctxt_w_id(ccx: @CrateContext,
             ty::subst_tps(ccx.tcx, substs.tys, substs.self_ty, output_type)
         }
     };
-    let imm = ty::type_is_immediate(substd_output_type);
+    let is_immediate = ty::type_is_immediate(substd_output_type);
 
     let fcx = @mut fn_ctxt_ {
           llfn: llfndecl,
-          llenv: unsafe {
-              llvm::LLVMGetParam(llfndecl, arg_env(imm) as c_uint)
-          },
+          llenv: unsafe { llvm::LLVMGetParam(llfndecl, 1u as c_uint) },
           llretptr: None,
           llstaticallocas: llbbs.sa,
           llloadenv: None,
           llreturn: llbbs.rt,
           llself: None,
           personality: None,
           loop_ret: None,
-          has_immediate_return_value: imm,
+          has_immediate_return_value: is_immediate,
           llargs: @mut HashMap::new(),
           lllocals: @mut HashMap::new(),
           llupvars: @mut HashMap::new(),
@@ -1638,15 +1636,15 @@ pub fn new_fn_ctxt_w_id(ccx: @CrateContext,
     };
 
     fcx.llretptr = Some(make_return_pointer(fcx, substd_output_type));
-    (fcx, imm)
+    fcx
 }
 
 pub fn new_fn_ctxt(ccx: @CrateContext,
                    path: path,
                    llfndecl: ValueRef,
                    output_type: ty::t,
                    sp: Option<span>)
-                -> (fn_ctxt, bool) {
+                -> fn_ctxt {
     new_fn_ctxt_w_id(ccx, path, llfndecl, -1, output_type, None, None, sp)
 }
 
@@ -1666,8 +1664,7 @@ pub fn new_fn_ctxt(ccx: @CrateContext,
 // field of the fn_ctxt with
 pub fn create_llargs_for_fn_args(cx: fn_ctxt,
                                  self_arg: self_arg,
-                                 args: &[ast::arg],
-                                 ret_imm: bool)
+                                 args: &[ast::arg])
                               -> ~[ValueRef] {
     let _icx = cx.insn_ctxt("create_llargs_for_fn_args");
 
@@ -1693,7 +1690,7 @@ pub fn create_llargs_for_fn_args(cx: fn_ctxt,
     // llvm::LLVMGetParam for each argument.
     vec::from_fn(args.len(), |i| {
         unsafe {
-            let arg_n = arg_pos(ret_imm, i);
+            let arg_n = first_real_arg + i;
             let arg = &args[i];
             let llarg = llvm::LLVMGetParam(cx.llfn, arg_n as c_uint);
 
@@ -1832,15 +1829,15 @@ pub fn trans_closure(ccx: @CrateContext,
            param_substs.repr(ccx.tcx));
 
     // Set up arguments to the function.
-    let (fcx, imm) = new_fn_ctxt_w_id(ccx,
-                                       path,
-                                       llfndecl,
-                                       id,
-                                       output_type,
-                                       impl_id,
-                                       param_substs,
-                                       Some(body.span));
-    let raw_llargs = create_llargs_for_fn_args(fcx, self_arg, decl.inputs, imm);
+    let fcx = new_fn_ctxt_w_id(ccx,
+                               path,
+                               llfndecl,
+                               id,
+                               output_type,
+                               impl_id,
+                               param_substs,
+                               Some(body.span));
+    let raw_llargs = create_llargs_for_fn_args(fcx, self_arg, decl.inputs);
 
     // Set the fixed stack segment flag if necessary.
     if attr::attrs_contains_name(attributes, "fixed_stack_segment") {
@@ -1965,16 +1962,16 @@ pub fn trans_enum_variant(ccx: @CrateContext,
                                 ty_param_substs,
                                 None,
                                 ty::node_id_to_type(ccx.tcx, enum_id));
-    let (fcx, imm) = new_fn_ctxt_w_id(ccx,
-                                       ~[],
-                                       llfndecl,
-                                       variant.node.id,
-                                       enum_ty,
-                                       None,
-                                       param_substs,
-                                       None);
-
-    let raw_llargs = create_llargs_for_fn_args(fcx, no_self, fn_args, imm);
+    let fcx = new_fn_ctxt_w_id(ccx,
+                               ~[],
+                               llfndecl,
+                               variant.node.id,
+                               enum_ty,
+                               None,
+                               param_substs,
+                               None);
+
+    let raw_llargs = create_llargs_for_fn_args(fcx, no_self, fn_args);
     let bcx = top_scope_block(fcx, None), lltop = bcx.llbb;
     let arg_tys = ty::ty_fn_args(node_id_type(bcx, variant.node.id));
     let bcx = copy_args_to_allocas(fcx, bcx, fn_args, raw_llargs, arg_tys);
@@ -2044,16 +2041,16 @@ pub fn trans_tuple_struct(ccx: @CrateContext,
                                ty_to_str(ccx.tcx, ctor_ty)))
     };
 
-    let (fcx, imm) = new_fn_ctxt_w_id(ccx,
-                                       ~[],
-                                       llfndecl,
-                                       ctor_id,
-                                       tup_ty,
-                                       None,
-                                       param_substs,
-                                       None);
+    let fcx = new_fn_ctxt_w_id(ccx,
+                               ~[],
+                               llfndecl,
+                               ctor_id,
+                               tup_ty,
+                               None,
+                               param_substs,
+                               None);
 
-    let raw_llargs = create_llargs_for_fn_args(fcx, no_self, fn_args, imm);
+    let raw_llargs = create_llargs_for_fn_args(fcx, no_self, fn_args);
 
     let bcx = top_scope_block(fcx, None);
     let lltop = bcx.llbb;
@@ -2296,21 +2293,19 @@ pub fn create_entry_wrapper(ccx: @CrateContext,
 
     fn create_main(ccx: @CrateContext, main_llfn: ValueRef) -> ValueRef {
         let nt = ty::mk_nil();
-
         let llfty = type_of_fn(ccx, [], nt);
         let llfdecl = decl_fn(ccx.llmod, "_rust_main",
                               lib::llvm::CCallConv, llfty);
 
-        let (fcx, _) = new_fn_ctxt(ccx, ~[], llfdecl, nt, None);
+        let fcx = new_fn_ctxt(ccx, ~[], llfdecl, nt, None);
 
         let bcx = top_scope_block(fcx, None);
         let lltop = bcx.llbb;
 
         // Call main.
-        let llenvarg = unsafe {
-            llvm::LLVMGetParam(llfdecl, arg_env(true) as c_uint)
-        };
-        let args = ~[llenvarg];
+        let lloutputarg = C_null(T_ptr(T_i8()));
+        let llenvarg = unsafe { llvm::LLVMGetParam(llfdecl, 1 as c_uint) };
+        let args = ~[lloutputarg, llenvarg];
         let llresult = Call(bcx, main_llfn, args);
         Store(bcx, llresult, fcx.llretptr.get());
 
@@ -2352,6 +2347,8 @@ pub fn create_entry_wrapper(ccx: @CrateContext,
                 trans_external_path(ccx, start_def_id, start_fn_type);
             }
 
+            let retptr = llvm::LLVMBuildAlloca(bld, T_i8(), noname());
+
             let crate_map = ccx.crate_map;
             let opaque_crate_map = llvm::LLVMBuildPointerCast(bld,
                                                               crate_map,
@@ -2374,6 +2371,7 @@ pub fn create_entry_wrapper(ccx: @CrateContext,
                             bld, rust_main, T_ptr(T_i8()), noname());
 
                     ~[
+                        retptr,
                         C_null(T_opaque_box_ptr(ccx)),
                         opaque_rust_main,
                         llvm::LLVMGetParam(llfn, 0),
@@ -2386,6 +2384,7 @@ pub fn create_entry_wrapper(ccx: @CrateContext,
                 debug!("using user-defined start fn");
                 let args = {
                     ~[
+                        retptr,
                         C_null(T_opaque_box_ptr(ccx)),
                         llvm::LLVMGetParam(llfn, 0 as c_uint),
                         llvm::LLVMGetParam(llfn, 1 as c_uint),

branches/auto/src/librustc/middle/trans/cabi.rs

@@ -132,8 +132,7 @@ pub impl FnType {
                        bcx: block,
                        ret_ty: TypeRef,
                        llwrapfn: ValueRef,
-                       llargbundle: ValueRef,
-                       ret_imm: bool) {
+                       llargbundle: ValueRef) {
         let mut atys = /*bad*/copy self.arg_tys;
         let mut attrs = /*bad*/copy self.attrs;
         let mut j = 0u;

branches/auto/src/librustc/middle/trans/callee.rs

@@ -510,7 +510,11 @@ pub fn trans_call_inner(in_cx: block,
 
         let mut llargs = ~[];
 
-        if !ty::type_is_immediate(ret_ty) {
+        if ty::type_is_immediate(ret_ty) {
+            unsafe {
+                llargs.push(llvm::LLVMGetUndef(T_ptr(T_i8())));
+            }
+        } else {
             llargs.push(llretslot);
         }
 

branches/auto/src/librustc/middle/trans/common.rs

@@ -660,26 +660,8 @@ pub fn mk_block(llbb: BasicBlockRef, parent: Option<block>, kind: block_kind,
     @mut block_(llbb, parent, kind, is_lpad, node_info, fcx)
 }
 
-pub fn arg_pos(ret_imm: bool, arg: uint) -> uint {
-    if ret_imm {
-        arg + 1u
-    } else {
-        arg + 2u
-    }
-}
-
-pub fn arg_out(ret_imm: bool) -> uint {
-    assert!(ret_imm);
-    0u
-}
-
-pub fn arg_env(ret_imm: bool) -> uint {
-    if !ret_imm {
-        1u
-    } else {
-        0u
-    }
-}
+// First two args are retptr, env
+pub static first_real_arg: uint = 2u;
 
 pub struct Result {
     bcx: block,
@@ -980,7 +962,8 @@ pub fn T_tydesc(targ_cfg: @session::config) -> TypeRef {
     let tydescpp = T_ptr(T_ptr(tydesc));
     let pvoid = T_ptr(T_i8());
     let glue_fn_ty =
-        T_ptr(T_fn([T_ptr(T_nil()), tydescpp, pvoid], T_void()));
+        T_ptr(T_fn([T_ptr(T_nil()), T_ptr(T_nil()), tydescpp,
+                    pvoid], T_void()));
 
     let int_type = T_int(targ_cfg);
     let elems =