diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-27 22:47:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-27 22:47:58 +0000 |
| commit | bab6f6bcb299ac42096783cda32b8f11da4288ca (patch) | |
| tree | 81faf7ad1d57cbc6abe0e7e6405ed4f19ea7fbf4 | |
| parent | f4668ee7ead955ead1e9b9171e661e1c0409cb81 (diff) | |
| parent | 69ed5eaef43c2997c584347a438b5db8351666d8 (diff) | |
| download | gcc-bab6f6bcb299ac42096783cda32b8f11da4288ca.zip gcc-bab6f6bcb299ac42096783cda32b8f11da4288ca.tar.gz gcc-bab6f6bcb299ac42096783cda32b8f11da4288ca.tar.bz2 | |
Merge #530
530: Fix inner attribute parsing r=philberty a=dkm
parse_inner_attribute tried to skip the right square token twice. This caused odd error
messages in case there were multiple inner attributes. This bug masked another bug in
parse_attr_input where when the (optional) attr input was an assignment to a literal
the parser failed to skip the literal.
The existing top_attr.rs testcase relied on the two bugs cancelling each other out.
Add a new testcase inner_attributes.rs for the first bug.
Resolves: https://github.com/Rust-GCC/gccrs/issues/510
Co-authored-by: Mark Wielaard <mark@klomp.org>
| -rw-r--r-- | gcc/rust/parse/rust-parse-impl.h | 2 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/torture/inner_attributes.rs | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index 014beaf..23e6234 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -495,7 +495,6 @@ Parser<ManagedTokenSource>::parse_inner_attribute () return AST::Attribute::create_empty (); AST::Attribute actual_attribute = parse_attribute_body (); - lexer.skip_token (); if (!skip_token (RIGHT_SQUARE)) return AST::Attribute::create_empty (); @@ -785,6 +784,7 @@ Parser<ManagedTokenSource>::parse_attr_input () // create actual LiteralExpr AST::LiteralExpr lit_expr (t->get_str (), lit_type, t->get_type_hint (), {}, t->get_locus ()); + lexer.skip_token (); std::unique_ptr<AST::AttrInput> attr_input_lit ( new AST::AttrInputLiteral (std::move (lit_expr))); diff --git a/gcc/testsuite/rust/compile/torture/inner_attributes.rs b/gcc/testsuite/rust/compile/torture/inner_attributes.rs new file mode 100644 index 0000000..3410dd6 --- /dev/null +++ b/gcc/testsuite/rust/compile/torture/inner_attributes.rs @@ -0,0 +1,3 @@ +#![allow(dead_code)] +#![allow(unused_variables)] +pub fn main () { } |