3 files changed, 19 insertions, 3 deletions
diff --git a/gcc/rust/typecheck/rust-hir-type-check-expr.cc b/gcc/rust/typecheck/rust-hir-type-check-expr.cc
index 95812d0..0b72fb6 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-expr.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-expr.cc
@@ -1290,8 +1290,9 @@ TypeCheckExpr::visit (HIR::BreakExpr &expr)
       TyTy::BaseType *loop_context = context->peek_loop_context ();
       if (loop_context->get_kind () == TyTy::TypeKind::ERROR)
 	{
-	  rust_error_at (expr.get_locus (),
-			 "can only break with a value inside %<loop%>");
+	  rust_error_at (
+	    expr.get_locus (), ErrorCode::E0571,
+	    "can only %<break%> with a value inside a %<loop%> block");
 	  return;
 	}
 
diff --git a/gcc/testsuite/rust/compile/break2.rs b/gcc/testsuite/rust/compile/break2.rs
index 7d58031..a8af47a 100644
--- a/gcc/testsuite/rust/compile/break2.rs
+++ b/gcc/testsuite/rust/compile/break2.rs
@@ -1,3 +1,4 @@
+// ErrorCode::E0571
 fn main() {
     let mut a = 1;
     let mut b = 1;
@@ -5,7 +6,7 @@ fn main() {
     let mut c;
     while b > 10 {
         if (b == 2) {
-            break b;  // { dg-error "can only break with a value inside 'loop'" }
+            break b; // { dg-error "can only .break. with a value inside a .loop. block" }
         }
         c = a + b;
         a = b;
diff --git a/gcc/testsuite/rust/compile/break_with_value_inside_loop.rs b/gcc/testsuite/rust/compile/break_with_value_inside_loop.rs
new file mode 100644
index 0000000..84491f6
--- /dev/null
+++ b/gcc/testsuite/rust/compile/break_with_value_inside_loop.rs
@@ -0,0 +1,14 @@
+// https://doc.rust-lang.org/error_codes/E0571.html
+#![allow(unused)]
+fn main() {
+    let mut i = 1;
+    fn satisfied(n: usize) -> bool {
+        n % 23 == 0
+    }
+    let result = while true {
+        if satisfied(i) {
+            break 2 * i;   // { dg-error "can only .break. with a value inside a .loop. block" }
+        }
+        i += 1;
+    };
+}