---

yaml
---
r: 5347
b: refs/heads/master
c: 43b219d
h: refs/heads/master
i:
  5345: 0bd1186
  5343: 67ac08a
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 575aae407bc5da4ab092c6877ddb574a7bf5b83b
+refs/heads/master: 43b219dbec5a3fa0ded5c02c95149d8517343087

trunk/src/comp/middle/trans.rs

@@ -3709,19 +3709,20 @@ fn trans_call(in_cx: @block_ctxt, f: @ast::expr,
     let bcx = f_res.bcx;
 
     let faddr = f_res.val;
-    let llenv = alt f_res.env {
-      null_env. { C_null(T_opaque_closure_ptr(*bcx_ccx(cx))) }
-      some_env(e) { e }
+    let llenv;
+    alt f_res.env {
+      null_env. { llenv = C_null(T_opaque_closure_ptr(*bcx_ccx(cx))); }
+      some_env(e) { llenv = e; }
       is_closure. {
         // It's a closure. Have to fetch the elements
         if f_res.is_mem { faddr = load_if_immediate(bcx, faddr, fn_expr_ty); }
         let pair = faddr;
         faddr = GEP(bcx, pair, [C_int(0), C_int(abi::fn_field_code)]);
         faddr = Load(bcx, faddr);
         let llclosure = GEP(bcx, pair, [C_int(0), C_int(abi::fn_field_box)]);
-        Load(bcx, llclosure)
+        llenv = Load(bcx, llclosure);
       }
-    };
+    }
 
     let ret_ty = ty::node_id_to_type(bcx_tcx(cx), id);
     let args_res =