---

yaml
---
r: 157583
b: refs/heads/snap-stage3
c: 6d2080c
h: refs/heads/master
i:
  157581: 7328e01
  157579: e3a3934
  157575: 5fa3cb6
  157567: bcc719a
v: v3

Author: Jakub Bukaj

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 065caf34f5ff29e04605f95d9c5d511af219439a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 7f523e72522901d3a0e2666031ec363f5729181a
+refs/heads/snap-stage3: 6d2080c44878924bdcde57ec7735327af0ee267d
 refs/heads/try: 0ee4d8b0b112c608646fa75463ab4dc59132efd9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/liveness.rs

@@ -104,6 +104,8 @@
  *   fallthrough node.  It is only live if the function could converge
  *   via means other than an explicit `return` expression. That is, it is
  *   only dead if the end of the function's block can never be reached.
+ *   It is the responsibility of typeck to ensure that there are no
+ *   `return` expressions in a function declared as diverging.
  */
 
 use middle::def::*;

branches/snap-stage3/src/librustc/middle/trans/callee.rs

@@ -876,11 +876,8 @@ pub fn trans_call_inner<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
         _ => {}
     }
 
-    match ret_ty {
-        ty::FnConverging(_) => {},
-        ty::FnDiverging => {
-            Unreachable(bcx);
-        }
+    if ret_ty == ty::FnDiverging {
+        Unreachable(bcx);
     }
 
     Result::new(bcx, llresult)

branches/snap-stage3/src/librustc/middle/trans/intrinsic.rs

@@ -204,7 +204,7 @@ pub fn trans_intrinsic_call<'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>, node: ast::N
 
     fcx.pop_custom_cleanup_scope(cleanup_scope);
 
-    // The only intrinsic function that diverges.
+    // These are the only intrinsic functions that diverge.
     if name.get() == "abort" {
         let llfn = ccx.get_intrinsic(&("llvm.trap"));
         Call(bcx, llfn, [], None);

branches/snap-stage3/src/librustc/util/ppaux.rs

@@ -957,12 +957,10 @@ impl Repr for ty::FnSig {
 impl Repr for ty::FnOutput {
     fn repr(&self, tcx: &ctxt) -> String {
         match *self {
-          ty::FnConverging(ty) => {
-            format!("FnConverging({0})", ty.repr(tcx))
-          }
-          ty::FnDiverging => {
-            "FnDiverging".to_string()
-          }
+            ty::FnConverging(ty) =>
+                format!("FnConverging({0})", ty.repr(tcx)),
+            ty::FnDiverging =>
+                "FnDiverging".to_string()
         }
     }
 }