public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Arthur Cohen <cohenarthur@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r13-5542] gccrs: transcriber: Do not infinite loop if the current parsed node is an error
Date: Tue, 31 Jan 2023 13:14:57 +0000 (GMT)	[thread overview]
Message-ID: <20230131131457.2C4E03858C66@sourceware.org> (raw)

https://gcc.gnu.org/g:252216dd0c5956dfb931031fd1f8dfa59c922160

commit r13-5542-g252216dd0c5956dfb931031fd1f8dfa59c922160
Author: Arthur Cohen <arthur.cohen@embecosm.com>
Date:   Mon Aug 29 16:23:51 2022 +0200

    gccrs: transcriber: Do not infinite loop if the current parsed node is an error
    
    gcc/rust/ChangeLog:
    
            * expand/rust-macro-expand.cc (parse_many): Return early from parsing
            loop if we encounter an error, and emit that error in the meantime.
    
    Co-authored-by: philberty <philip.herron@embecosm.com>

Diff:
---
 gcc/rust/expand/rust-macro-expand.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gcc/rust/expand/rust-macro-expand.cc b/gcc/rust/expand/rust-macro-expand.cc
index df258bd96ec..ed1b838c987 100644
--- a/gcc/rust/expand/rust-macro-expand.cc
+++ b/gcc/rust/expand/rust-macro-expand.cc
@@ -731,6 +731,14 @@ parse_many (Parser<MacroInvocLexer> &parser, TokenId &delimiter,
 	break;
 
       auto node = parse_fn ();
+      if (node.is_error ())
+	{
+	  for (auto err : parser.get_errors ())
+	    err.emit_error ();
+
+	  return AST::ASTFragment::create_error ();
+	}
+
       nodes.emplace_back (std::move (node));
     }

                 reply	other threads:[~2023-01-31 13:14 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230131131457.2C4E03858C66@sourceware.org \
    --to=cohenarthur@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).