---

yaml
---
r: 3800
b: refs/heads/master
c: 0beb271
h: refs/heads/master
v: v3

Author: msullivan

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15a670a1b1b43991679b17c14eb5d188058f708a
+refs/heads/master: 0beb271d8c74618a0b423c80692c0a2bc070b014

trunk/src/comp/middle/trans.rs

@@ -5525,8 +5525,12 @@ fn trans_bind_thunk(&@local_ctxt cx, &span sp, &ty::t incoming_fty,
                         bcx = copy_ty(bcx, val, e_ty).bcx;
                         val = bcx.build.Load(val);
                     }
-                } else if (ty::type_contains_params(cx.ccx.tcx, out_arg.ty)) {
-                    assert (out_arg.mode != ty::mo_val);
+                }
+                // If the type is parameterized, then we need to cast the
+                // type we actually have to the parameterized out type.
+                if (ty::type_contains_params(cx.ccx.tcx, out_arg.ty)) {
+                    // FIXME: (#642) This works for boxes and alias params
+                    // but does not work for bare functions.
                     val = bcx.build.PointerCast(val, llout_arg_ty);
                 }
                 llargs += ~[val];