summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Cohen <arthur.cohen@embecosm.com>2023-04-19 17:40:15 +0200
committerCohenArthur <arthur.cohen@embecosm.com>2023-04-21 08:47:11 +0000
commit82e26f836210a2defed7e49d7d2655b5525f0561 (patch)
tree46d44207a78d07a1df1d416fd21dbe1c6d1b7277
parent428a31804b8c56fd8aee8b7db7adf087e350ad60 (diff)
downloadgcc-82e26f836210a2defed7e49d7d2655b5525f0561.tar.gz
parser: Parse reference patterns correctly
Reference patterns cannot contain AltPatterns per the Rust reference, so we should not call into `parse_pattern` to parse the referenced pattern, but rather the more restrictive `parse_pattern_no_alt`. gcc/rust/ChangeLog: * parse/rust-parse-impl.h (Parser::parse_reference_pattern): Do not call into `parse_pattern` anymore. gcc/testsuite/ChangeLog: * rust/compile/issue-1807.rs: New test.
-rw-r--r--gcc/rust/parse/rust-parse-impl.h2
-rw-r--r--gcc/testsuite/rust/compile/issue-1807.rs6
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h
index 48ac521a867..b3b1bb218d6 100644
--- a/gcc/rust/parse/rust-parse-impl.h
+++ b/gcc/rust/parse/rust-parse-impl.h
@@ -10949,7 +10949,7 @@ Parser<ManagedTokenSource>::parse_reference_pattern ()
}
// parse pattern to get reference of (required)
- std::unique_ptr<AST::Pattern> pattern = parse_pattern ();
+ std::unique_ptr<AST::Pattern> pattern = parse_pattern_no_alt ();
if (pattern == nullptr)
{
Error error (lexer.peek_token ()->get_locus (),
diff --git a/gcc/testsuite/rust/compile/issue-1807.rs b/gcc/testsuite/rust/compile/issue-1807.rs
new file mode 100644
index 00000000000..fe821f0fc90
--- /dev/null
+++ b/gcc/testsuite/rust/compile/issue-1807.rs
@@ -0,0 +1,6 @@
+// { dg-additional-options "-fsyntax-only" }
+
+fn main() {
+ let is_zero = &|&&d: &&u8| -> bool { d == b'0' };
+ let lambda = |&c| c != b'9';
+}