From f6244f1516d4466994b3f0eb3587ba676203f4ca Mon Sep 17 00:00:00 2001
From: Simonas Kazlauskas <git@kazlauskas.me>
Date: Wed, 2 Sep 2015 22:35:04 +0300
Subject: [PATCH] Fix #28105 test and add a test for #28109

---
 src/test/compile-fail/issue-28105.rs | 15 +++++----------
 src/test/compile-fail/issue-28109.rs | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 src/test/compile-fail/issue-28109.rs

diff --git a/src/test/compile-fail/issue-28105.rs b/src/test/compile-fail/issue-28105.rs
index 6ae635877b78..8e58d1aaf240 100644
--- a/src/test/compile-fail/issue-28105.rs
+++ b/src/test/compile-fail/issue-28105.rs
@@ -1,4 +1,4 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -11,13 +11,8 @@
 // Make sure that a continue span actually contains the keyword.
 
 fn main() {
-    'a: loop {
-        if false {
-            continue //~ ERROR use of undeclared label
-            'b;
-        } else {
-            break //~ ERROR use of undeclared label
-            'c;
-        }
-    }
+    continue //~ ERROR `continue` outside of loop
+    ;
+    break //~ ERROR `break` outside of loop
+    ;
 }
diff --git a/src/test/compile-fail/issue-28109.rs b/src/test/compile-fail/issue-28109.rs
new file mode 100644
index 000000000000..73163caa455f
--- /dev/null
+++ b/src/test/compile-fail/issue-28109.rs
@@ -0,0 +1,20 @@
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// Make sure that label for continue and break is spanned correctly
+
+fn main() {
+    continue
+    'b //~ ERROR use of undeclared label
+    ;
+    break
+    'c //~ ERROR use of undeclared label
+    ;
+}