diff mbox series

[COMMITTED] gccrs: transcriber: Do not infinite loop if the current parsed node is an error

Message ID 20230131132448.661684-1-arthur.cohen@embecosm.com
State Committed
Commit 252216dd0c5956dfb931031fd1f8dfa59c922160
Headers
Series [COMMITTED] gccrs: transcriber: Do not infinite loop if the current parsed node is an error |

Commit Message

Arthur Cohen Jan. 31, 2023, 1:24 p.m. UTC 
  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>

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/rust/expand/rust-macro-expand.cc | 8 ++++++++
 1 file changed, 8 insertions(+)
diff mbox series

Patch

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));
     }