rustc: Decouple new_fn_ctxt() from AST function arguments, so that it can be used to generate glue

1 files changed, 17 insertions, 11 deletions

diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs
index efbff5d263e..33b8bc5ffe7 100644
--- a/src/comp/middle/trans.rs
+++ b/src/comp/middle/trans.rs
@@ -1814,22 +1814,13 @@ impure fn trans_block(@block_ctxt cx, &ast.block b) -> result {
 
 fn new_fn_ctxt(@crate_ctxt cx,
                str name,
-               vec[ast.arg] args,
                ValueRef llfndecl) -> @fn_ctxt {
 
     let ValueRef lltaskptr = llvm.LLVMGetParam(llfndecl, 0u);
-    let uint arg_n = 1u;
 
     let hashmap[ast.def_id, ValueRef] lllocals = new_def_hash[ValueRef]();
     let hashmap[ast.def_id, ValueRef] llargs = new_def_hash[ValueRef]();
 
-    for (ast.arg arg in args) {
-        auto llarg = llvm.LLVMGetParam(llfndecl, arg_n);
-        check (llarg as int != 0);
-        llargs.insert(arg.id, llarg);
-        arg_n += 1u;
-    }
-
     ret @rec(llfn=llfndecl,
              lltaskptr=lltaskptr,
              llargs=llargs,
@@ -1838,6 +1829,17 @@ fn new_fn_ctxt(@crate_ctxt cx,
 }
 
 
+fn create_llargs_for_fn_args(@fn_ctxt cx, vec[ast.arg] args) {
+    let uint arg_n = 1u;
+    for (ast.arg arg in args) {
+        auto llarg = llvm.LLVMGetParam(cx.llfn, arg_n);
+        check (llarg as int != 0);
+        cx.llargs.insert(arg.id, llarg);
+        arg_n += 1u;
+    }
+}
+
+
 // Recommended LLVM style, strange though this is, is to copy from args to
 // allocas immediately upon entry; this permits us to GEP into structures we
 // were passed and whatnot. Apparently mem2reg will mop up.
@@ -1881,7 +1883,9 @@ impure fn trans_fn(@crate_ctxt cx, &ast._fn f, ast.def_id fid,
     auto llfndecl = cx.item_ids.get(fid);
     cx.item_names.insert(cx.path, llfndecl);
 
-    auto fcx = new_fn_ctxt(cx, cx.path, f.inputs, llfndecl);
+    auto fcx = new_fn_ctxt(cx, cx.path, llfndecl);
+    create_llargs_for_fn_args(fcx, f.inputs);
+
     auto bcx = new_top_block_ctxt(fcx);
 
     copy_args_to_allocas(bcx, f.inputs, arg_tys_of_fn(ann));
@@ -1920,7 +1924,9 @@ fn trans_tag_variant(@crate_ctxt cx, ast.def_id tag_id,
     let ValueRef llfndecl = cx.item_ids.get(variant.id);
     cx.item_names.insert(cx.path, llfndecl);
 
-    auto fcx = new_fn_ctxt(cx, cx.path, fn_args, llfndecl);
+    auto fcx = new_fn_ctxt(cx, cx.path, llfndecl);
+    create_llargs_for_fn_args(fcx, fn_args);
+
     auto bcx = new_top_block_ctxt(fcx);
 
     auto arg_tys = arg_tys_of_fn(variant.ann);