gccrs: Fix infinite loop with parsing invalid generic parameters

gcc/rust/ChangeLog:

	* parse/rust-parse-impl.h
	(Parser::parse_generic_params):
	Handle parameter parsing error.

gcc/testsuite/ChangeLog:

	* rust/compile/issue-2125.rs: New test.

Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>

diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h
index 0fb96dcfb516d3992ac2a8c84ccbcef39d39dae5..042018de9a22c155ac20b4e3ad38ab679ce1cb2b 100644 (file)
--- a/gcc/rust/parse/rust-parse-impl.h
+++ b/gcc/rust/parse/rust-parse-impl.h
@@ -3127,6 +3127,8 @@ Parser<ManagedTokenSource>::parse_generic_params (EndTokenPred is_end_token)
          generic_params.emplace_back (std::move (param));
          maybe_skip_token (COMMA);
        }
+      else
+       break;
     }
 
   // FIXME: Add reordering hint

diff --git a/gcc/testsuite/rust/compile/issue-2125.rs b/gcc/testsuite/rust/compile/issue-2125.rs
new file mode 100644 (file)
index 0000000..cbcf4cb
--- /dev/null
+++ b/gcc/testsuite/rust/compile/issue-2125.rs
@@ -0,0 +1,2 @@
+// { dg-timeout 5 }
+struct S<$>; // { dg-error ".*" }