---

yaml
---
r: 165409
b: refs/heads/master
c: 5722410
h: refs/heads/master
i:
  165407: a8b3566
v: v3

Author: Aatch

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b4f54f96df60337cb939f6f753a1cc6181e70f4b
+refs/heads/master: 5722410f72d0698f6ad9ba668e2282ff0bac5043
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 658529467d9d69ac9e09cacf98a6d61d781c2c76
 refs/heads/try: aee614fc4973262a5a68efc643026e2b1458d65b

trunk/src/librustc/middle/graph.rs

@@ -314,7 +314,7 @@ pub struct DepthFirstTraversal<'g, N:'g, E:'g> {
 impl<'g, N, E> Iterator<&'g N> for DepthFirstTraversal<'g, N, E> {
     fn next(&mut self) -> Option<&'g N> {
         while let Some(idx) = self.stack.pop() {
-            if self.visited.insert(idx.node_id()) {
+            if !self.visited.insert(idx.node_id()) {
                 continue;
             }
             self.graph.each_outgoing_edge(idx, |_, e| -> bool {

trunk/src/librustc_trans/trans/expr.rs

@@ -945,6 +945,10 @@ fn trans_rvalue_stmt_unadjusted<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
                 if let &Some(ref x) = ex {
                     bcx = trans_into(bcx, &**x, Ignore);
                 }
+                // Mark the end of the block as unreachable. Once we get to
+                // a return expression, there's no more we should be doing
+                // after this.
+                Unreachable(bcx);
                 bcx
             }
         }