---

yaml
---
r: 53948
b: refs/heads/dist-snap
c: e821671
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 14df8447445440794d363f6dc3fbb5220bb0a775
+refs/heads/dist-snap: e82167198900a8d592535f40307f7c3a71b8b72b
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/trans/callee.rs

@@ -491,12 +491,14 @@ pub fn trans_call_inner(
             }
         };
 
-        let args_res = trans_args(bcx, llenv, args, fn_expr_ty,
-                                  dest, ret_flag, autoref_arg);
-        bcx = args_res.bcx;
-        let mut llargs = /*bad*/copy args_res.args;
+        let llretslot = trans_ret_slot(bcx, fn_expr_ty, dest);
+
+        let mut llargs = ~[];
+        llargs.push(llretslot);
+        llargs.push(llenv);
+        bcx = trans_args(bcx, args, fn_expr_ty,
+                         ret_flag, autoref_arg, &mut llargs);
 
-        let llretslot = args_res.retslot;
 
         // Now that the arguments have finished evaluating, we need to revoke
         // the cleanup for the self argument, if it exists
@@ -554,30 +556,12 @@ pub enum CallArgs {
     ArgVals(&'self [ValueRef])
 }
 
-pub struct Args {
-    bcx: block,
-    args: ~[ValueRef],
-    retslot: ValueRef
-}
-
-pub fn trans_args(cx: block,
-                  llenv: ValueRef,
-                  +args: CallArgs,
-                  fn_ty: ty::t,
-                  dest: expr::Dest,
-                  ret_flag: Option<ValueRef>,
-                  +autoref_arg: AutorefArg) -> Args {
-    let _icx = cx.insn_ctxt("trans_args");
-    let mut temp_cleanups = ~[];
-    let arg_tys = ty::ty_fn_args(fn_ty);
-    let mut llargs: ~[ValueRef] = ~[];
-
-    let mut bcx = cx;
-
+pub fn trans_ret_slot(+bcx: block,
+                      +fn_ty: ty::t,
+                      +dest: expr::Dest) -> ValueRef
+{
     let retty = ty::ty_fn_ret(fn_ty);
-
-    // Arg 0: Output pointer.
-    let llretslot = match dest {
+    match dest {
         expr::SaveIn(dst) => dst,
         expr::Ignore => {
             if ty::type_is_nil(retty) {
@@ -588,13 +572,21 @@ pub fn trans_args(cx: block,
                 alloc_ty(bcx, retty)
             }
         }
-    };
-    llargs.push(llretslot);
+    }
+}
 
-    // Arg 1: Env (closure-bindings / self value)
-    llargs.push(llenv);
+pub fn trans_args(+cx: block,
+                  +args: CallArgs,
+                  +fn_ty: ty::t,
+                  +ret_flag: Option<ValueRef>,
+                  +autoref_arg: AutorefArg,
+                  +llargs: &mut ~[ValueRef]) -> block
+{
+    let _icx = cx.insn_ctxt("trans_args");
+    let mut temp_cleanups = ~[];
+    let arg_tys = ty::ty_fn_args(fn_ty);
 
-    // ... then explicit args.
+    let mut bcx = cx;
 
     // First we figure out the caller's view of the types of the arguments.
     // This will be needed if this is a generic call, because the callee has
@@ -623,7 +615,7 @@ pub fn trans_args(cx: block,
         revoke_clean(bcx, *c)
     }
 
-    Args { bcx: bcx, args: llargs, retslot: llretslot }
+    return bcx;
 }
 
 pub enum AutorefArg {

branches/dist-snap/src/libsyntax/ext/expand.rs

@@ -456,11 +456,6 @@ pub fn core_macros() -> ~str {
             if !$cond {
                 ::core::sys::fail_assert(stringify!($cond), file!(), line!())
             }
-        };
-        ($cond:expr, $msg:expr) => {
-            if !$cond {
-                ::core::sys::fail_assert($msg, file!(), line!())
-            }
         }
     )