public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-7559] gccrs: Fix "default unsafe fn ..." parsing
@ 2024-01-16 17:40 Arthur Cohen
0 siblings, 0 replies; only message in thread
From: Arthur Cohen @ 2024-01-16 17:40 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:af874e4bcd601e2fac3598c122641db6f3b1d95c
commit r14-7559-gaf874e4bcd601e2fac3598c122641db6f3b1d95c
Author: Owen Avery <powerboat9.gamer@gmail.com>
Date: Sun May 7 20:29:15 2023 -0400
gccrs: Fix "default unsafe fn ..." parsing
gcc/rust/ChangeLog:
* parse/rust-parse-impl.h
(Parser::parse_trait_impl_function_or_method):
Parse function/method qualifiers after "default".
gcc/testsuite/ChangeLog:
* rust/compile/parse_specialization.rs:
Add "default unsafe" coverage.
Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
Diff:
---
gcc/rust/parse/rust-parse-impl.h | 6 +++---
gcc/testsuite/rust/compile/parse_specialization.rs | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h
index 042018de9a2..1addbe95176 100644
--- a/gcc/rust/parse/rust-parse-impl.h
+++ b/gcc/rust/parse/rust-parse-impl.h
@@ -5686,9 +5686,6 @@ Parser<ManagedTokenSource>::parse_trait_impl_function_or_method (
// - template?
Location locus = lexer.peek_token ()->get_locus ();
- // parse function or method qualifiers
- AST::FunctionQualifiers qualifiers = parse_function_qualifiers ();
-
auto is_default = false;
auto t = lexer.peek_token ();
if (t->get_id () == IDENTIFIER && t->get_str () == "default")
@@ -5697,6 +5694,9 @@ Parser<ManagedTokenSource>::parse_trait_impl_function_or_method (
lexer.skip_token ();
}
+ // parse function or method qualifiers
+ AST::FunctionQualifiers qualifiers = parse_function_qualifiers ();
+
skip_token (FN_TOK);
// parse function or method name
diff --git a/gcc/testsuite/rust/compile/parse_specialization.rs b/gcc/testsuite/rust/compile/parse_specialization.rs
index 5de1f6a6f96..de50b5bedff 100644
--- a/gcc/testsuite/rust/compile/parse_specialization.rs
+++ b/gcc/testsuite/rust/compile/parse_specialization.rs
@@ -2,10 +2,12 @@
trait Foo {
fn bar();
+ unsafe fn bar_u();
}
struct S;
impl Foo for S {
default fn bar() {}
+ default unsafe fn bar_u() {}
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-01-16 17:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-16 17:40 [gcc r14-7559] gccrs: Fix "default unsafe fn ..." parsing Arthur Cohen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).