Skip to content

Stop an infinite loop at EOF #4303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+14 −1
Open

Stop an infinite loop at EOF #4303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fb4dfc
stop an infinite loop at END_OF_FILE
lucbf Nov 22, 2025
6e4700a
Add test for issue Rust-GCC#3608
lucbf Nov 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion gcc/rust/parse/rust-parse-impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1861,7 +1861,8 @@ Parser<ManagedTokenSource>::parse_macro_invocation_semi (

t = lexer.peek_token ();
// parse token trees until the initial delimiter token is found again
while (!token_id_matches_delims (t->get_id (), delim_type))
while (!token_id_matches_delims (t->get_id (), delim_type)
&& t->get_id () != END_OF_FILE)
{
std::unique_ptr<AST::TokenTree> tree = parse_token_tree ();

Expand Down
12 changes: 12 additions & 0 deletions gcc/testsuite/rust/compile/macros/mbe/macro-issue3608.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
include!(;

struct Baz {

impl Bar for


fn main() { )// { dg-error "unexpected closing delimiter .\\). - token tree requires either paired delimiters or non-delimiter tokens" }
// { dg-error "failed to parse token tree in delimited token tree - found .\\)." "" { target *-*-* } .-1 }
// { dg-error "unexpected token .end of file. - expecting closing delimiter .\}. .for a delimited token tree." "" { target *-*-* } .+3 }
// { dg-error "unexpected token .end of file. - expecting closing delimiter .\\). .for a macro invocation semi." "" { target *-*-* } .+2 }
// { dg-error "failed to parse item in crate" "" { target *-*-* } .+1 }