[gcc r14-7497] gccrs: parser: Parse reference patterns correctly

Arthur Cohen cohenarthur@gcc.gnu.org
Tue Jan 16 17:39:02 GMT 2024


https://gcc.gnu.org/g:94f2a1ce4b582e250b8a760a2acdd77cf98dd454

commit r14-7497-g94f2a1ce4b582e250b8a760a2acdd77cf98dd454
Author: Arthur Cohen <arthur.cohen@embecosm.com>
Date:   Wed Apr 19 17:40:15 2023 +0200

    gccrs: 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.

Diff:
---
 gcc/rust/parse/rust-parse-impl.h         | 2 +-
 gcc/testsuite/rust/compile/issue-1807.rs | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h
index 13f05419f41..c3aeda2e7c0 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';
+}


More information about the Gcc-cvs mailing list