about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-08-02 12:14:21 +0200
committerGitHub <noreply@github.com>2019-08-02 12:14:21 +0200
commit3396550420fb78fea45d8abdadb7dee60d40a6ca (patch)
tree5137be0d0fe4bb07b38dafe9d1294c7f8c8416eb /src/libsyntax
parent89dce46efdc7a626436b0ac8f825ac795a8799ad (diff)
parentb3321fb26ed8376b8c7e244d037d2763b12641cb (diff)
downloadrust-3396550420fb78fea45d8abdadb7dee60d40a6ca.tar.gz
rust-3396550420fb78fea45d8abdadb7dee60d40a6ca.zip
Rollup merge of #63202 - exphp-forks:parser-ice-63135, r=estebank
Fix ICE in #63135

Closes #63135.

r?@estebank
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/parse/parser.rs10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 7096d6799e2..8ca962a4419 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -3592,7 +3592,15 @@ impl<'a> Parser<'a> {
         let mut etc_span = None;
 
         while self.token != token::CloseDelim(token::Brace) {
-            let attrs = self.parse_outer_attributes()?;
+            let attrs = match self.parse_outer_attributes() {
+                Ok(attrs) => attrs,
+                Err(err) => {
+                    if let Some(mut delayed) = delayed_err {
+                        delayed.emit();
+                    }
+                    return Err(err);
+                },
+            };
             let lo = self.token.span;
 
             // check that a comma comes after every field