---

jld · catamorphism · commit 9eece944a4c8 · 2013-01-13T14:37:59.000-08:00
yaml --- r: 39831 b: refs/heads/incoming c: cd01ecf h: refs/heads/master i: 39829: ee8b468 39827: 52e0a18 39823: 33e755e v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 33414d81d10a8b35f420e4fbecbb7ee531190a2a
+refs/heads/incoming: cd01ecfe1329d90584d35d775f2a645abba61811
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/librustc/middle/trans/callee.rs b/branches/incoming/src/librustc/middle/trans/callee.rs
@@ -633,7 +633,7 @@ fn trans_arg_expr(bcx: block,
                         _
                     }) =>
                 {
-                    let scratch_ty = expr_ty(bcx, blk);
+                    let scratch_ty = expr_ty(bcx, arg_expr);
                     let scratch = alloc_ty(bcx, scratch_ty);
                     let arg_ty = expr_ty(bcx, arg_expr);
                     let proto = ty::ty_fn_proto(arg_ty);

Original file line number	Diff line number	Diff line change
`@@ -633,7 +633,7 @@ fn trans_arg_expr(bcx: block,`
`633`	`633`	`_`
`634`	`634`	`}) =>`
`635`	`635`	`{`
`636`		`- let scratch_ty = expr_ty(bcx, blk);`
	`636`	`+ let scratch_ty = expr_ty(bcx, arg_expr);`
`637`	`637`	`let scratch = alloc_ty(bcx, scratch_ty);`
`638`	`638`	`let arg_ty = expr_ty(bcx, arg_expr);`
`639`	`639`	`let proto = ty::ty_fn_proto(arg_ty);`