---

yaml
---
r: 2166
b: refs/heads/master
c: 9034a8f
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e6711fca5005364e908eae61ece8083cd334124
+refs/heads/master: 9034a8fbd6d44761c182e760a4aedd3a16cea912

trunk/src/comp/middle/trans.rs

@@ -5133,7 +5133,7 @@ fn trans_log(int lvl, @block_ctxt cx, @ast.expr e) -> result {
         lcx.ccx.module_data.insert(modname, global);
     }
 
-    auto log_cx = new_sub_block_ctxt(cx, "log");
+    auto log_cx = new_scope_block_ctxt(cx, "log");
     auto after_cx = new_sub_block_ctxt(cx, "after");
     auto load = cx.build.Load(global);
     auto test = cx.build.ICmp(lib.llvm.LLVMIntSGE, load, C_int(lvl));

trunk/src/test/run-pass/log-err-phi.rs

@@ -0,0 +1,6 @@
+fn main() {
+  if (false) {
+    log_err "foo" + "bar";
+  }
+}
+