Fix control flow check for breaking with diverging values

2 files changed, 24 insertions, 0 deletions

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`.