---

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

Author: catamorphism

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 1df8a543f12b489b9cbd53fb72e768a68ff690d7
+refs/heads/auto: 8c68c4a52cc98608793bdab8188d76ce02649d68
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/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 {

branches/auto/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;

branches/auto/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" { };
 }