From 5a440f1bc29c06fdaa93ce8e05da70fc081f74ba Mon Sep 17 00:00:00 2001
From: varkor <github@varkor.com>
Date: Tue, 29 Sep 2020 01:03:02 +0100
Subject: [PATCH] Fix control flow check for breaking with diverging values

---
 compiler/rustc_typeck/src/check/expr.rs  |  5 ++++-
 src/test/ui/break-diverging-value.rs     | 13 +++++++++++++
 src/test/ui/break-diverging-value.stderr | 11 +++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 src/test/ui/break-diverging-value.rs
 create mode 100644 src/test/ui/break-diverging-value.stderr

diff --git a/compiler/rustc_typeck/src/check/expr.rs b/compiler/rustc_typeck/src/check/expr.rs
index 9990f86a36b..15820d367c0 100644
--- a/compiler/rustc_typeck/src/check/expr.rs
+++ b/compiler/rustc_typeck/src/check/expr.rs
@@ -627,7 +627,10 @@ fn check_expr_break(
                 assert!(expr_opt.is_none() || self.tcx.sess.has_errors());
             }
 
-            ctxt.may_break = true;
+            // If we encountered a `break`, then (no surprise) it may be possible to break from the
+            // loop... unless the value being returned from the loop diverges itself, e.g.
+            // `break return 5` or `break loop {}`.
+            ctxt.may_break |= !e_ty.is_never();
 
             // the type of a `break` is always `!`, since it diverges
             tcx.types.never
diff --git a/src/test/ui/break-diverging-value.rs b/src/test/ui/break-diverging-value.rs
new file mode 100644
index 00000000000..0498580c7bd
--- /dev/null
+++ b/src/test/ui/break-diverging-value.rs
@@ -0,0 +1,13 @@
+fn loop_break_return() -> i32 {
+    let loop_value = loop { break return 0 }; // ok
+}
+
+fn loop_break_loop() -> i32 {
+    let loop_value = loop { break loop {} }; // ok
+}
+
+fn loop_break_break() -> i32 { //~ ERROR mismatched types
+    let loop_value = loop { break break };
+}
+
+fn main() {}
diff --git a/src/test/ui/break-diverging-value.stderr b/src/test/ui/break-diverging-value.stderr
new file mode 100644
index 00000000000..78a8d78ed34
--- /dev/null
+++ b/src/test/ui/break-diverging-value.stderr
@@ -0,0 +1,11 @@
+error[E0308]: mismatched types
+  --> $DIR/break-diverging-value.rs:9:26
+   |
+LL | fn loop_break_break() -> i32 {
+   |    ----------------      ^^^ expected `i32`, found `()`
+   |    |
+   |    implicitly returns `()` as its body has no tail or `return` expression
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
-- 
2.44.0