aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Avery <powerboat9.gamer@gmail.com>2023-04-18 00:46:59 -0400
committerArthur Cohen <arthur.cohen@embecosm.com>2024-01-16 18:34:15 +0100
commit582accedb77b7b957e1322966a0875491156d13a (patch)
treea25b7990b197fb37770f39bd28468dd17062f955
parent68a0eb254f6615ae53f7c9beb383fbc883857bc4 (diff)
downloadgcc-582accedb77b7b957e1322966a0875491156d13a.zip
gcc-582accedb77b7b957e1322966a0875491156d13a.tar.gz
gcc-582accedb77b7b957e1322966a0875491156d13a.tar.bz2
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>
-rw-r--r--gcc/rust/parse/rust-parse-impl.h2
-rw-r--r--gcc/testsuite/rust/compile/issue-2125.rs2
2 files changed, 4 insertions, 0 deletions
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h
index 0fb96dc..042018d 100644
--- 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
index 0000000..cbcf4cb
--- /dev/null
+++ b/gcc/testsuite/rust/compile/issue-2125.rs
@@ -0,0 +1,2 @@
+// { dg-timeout 5 }
+struct S<$>; // { dg-error ".*" }