From cc481a46cbdece1cffa087adb0c14f83de83a439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Esteban=20K=C3=BCber?= <esteban@kuber.com.ar>
Date: Thu, 11 Jul 2019 20:02:54 -0700
Subject: [PATCH 1/2] Correctly break out of recovery loop

---
 src/libsyntax/parse/parser.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 83dbff6b2d574..ce32491117b8b 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -4629,6 +4629,9 @@ impl<'a> Parser<'a> {
     fn parse_block_tail(&mut self, lo: Span, s: BlockCheckMode) -> PResult<'a, P<Block>> {
         let mut stmts = vec![];
         while !self.eat(&token::CloseDelim(token::Brace)) {
+            if self.token == token::Eof {
+                break;
+            }
             let stmt = match self.parse_full_stmt(false) {
                 Err(mut err) => {
                     err.emit();
@@ -4643,8 +4646,6 @@ impl<'a> Parser<'a> {
             };
             if let Some(stmt) = stmt {
                 stmts.push(stmt);
-            } else if self.token == token::Eof {
-                break;
             } else {
                 // Found only `;` or `}`.
                 continue;

From 8c5f6907a1ddb1dc19a4163775f087a46ca77c40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Esteban=20K=C3=BCber?= <esteban@kuber.com.ar>
Date: Fri, 12 Jul 2019 11:13:03 -0700
Subject: [PATCH 2/2] add test case

---
 src/test/ui/issues/issue-61858.rs     |  3 +++
 src/test/ui/issues/issue-61858.stderr | 10 ++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 src/test/ui/issues/issue-61858.rs
 create mode 100644 src/test/ui/issues/issue-61858.stderr

diff --git a/src/test/ui/issues/issue-61858.rs b/src/test/ui/issues/issue-61858.rs
new file mode 100644
index 0000000000000..6c3b56586c4ec
--- /dev/null
+++ b/src/test/ui/issues/issue-61858.rs
@@ -0,0 +1,3 @@
+fn main() {
+    (if foobar) //~ ERROR expected `{`, found `)`
+}
diff --git a/src/test/ui/issues/issue-61858.stderr b/src/test/ui/issues/issue-61858.stderr
new file mode 100644
index 0000000000000..ea2ec3d013f59
--- /dev/null
+++ b/src/test/ui/issues/issue-61858.stderr
@@ -0,0 +1,10 @@
+error: expected `{`, found `)`
+  --> $DIR/issue-61858.rs:2:15
+   |
+LL |     (if foobar)
+   |      --       ^ expected `{`
+   |      |
+   |      this `if` statement has a condition, but no block
+
+error: aborting due to previous error
+