Fix use of wrong block context in return-from-loop code

Closes #2142

Author: marijnh

src/cargo/pgp.rs

@@ -89,9 +89,8 @@ fn verify(root: str, data: str, sig: str, keyfp: str) -> bool {
     let p = gpg(["--homedir", path, "--with-fingerprint", "--verify", sig,
                  data]);
     let res = "Primary key fingerprint: " + keyfp;
-    let mut rslt = false;
     for str::split_char(p.err, '\n').each {|line|
-        if line == res { rslt = true; }
+        if line == res { ret true; }
     }
-    ret rslt;
+    ret false;
 }

src/rustc/middle/trans/base.rs

@@ -2757,8 +2757,8 @@ fn trans_call_inner(in_cx: block, fn_expr_ty: ty::t, ret_ty: ty::t,
         let mut bcx = f_res.bcx;
         let ccx = cx.ccx();
         let ret_flag = if ret_in_loop {
-            let flag = alloca(in_cx, T_bool());
-            Store(cx, C_bool(false), flag);
+            let flag = alloca(bcx, T_bool());
+            Store(bcx, C_bool(false), flag);
             some(flag)
         } else { none };