---

yaml
---
r: 65180
b: refs/heads/master
c: 8c68c4a
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1df8a543f12b489b9cbd53fb72e768a68ff690d7
+refs/heads/master: 8c68c4a52cc98608793bdab8188d76ce02649d68
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/librustc/middle/trans/expr.rs

@@ -499,6 +499,10 @@ fn trans_rvalue_stmt_unadjusted(bcx: block, expr: @ast::expr) -> block {
     let mut bcx = bcx;
     let _icx = bcx.insn_ctxt("trans_rvalue_stmt");
 
+    if bcx.unreachable {
+        return bcx;
+    }
+
     trace_span!(bcx, expr.span, @shorten(bcx.expr_to_str(expr)));
 
     match expr.node {

trunk/src/test/compile-fail/issue-2478.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-test
-fn foo<'a>() -> &'a int {  //~ ERROR unconstrained region
+fn foo() -> &'a int {
     return &x;
 }
 static x: int = 5;

trunk/src/test/run-pass/issue-3796.rs

@@ -8,9 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
 fn main() {
-   let mut x = ~3;
-   x = x;
-   assert_eq!(*x, 3);
+    return;
+    while io::stdin().read_line() != ~"quit" { };
 }