Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor all attribute functions in rust-compile-base.cc #3336

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor all attribute functions in rust-compile-base.cc #3336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 3 additions & 61 deletions gcc/rust/backend/rust-compile-base.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "rust-compile-implitem.h"
#include "rust-attribute-values.h"
#include "rust-immutable-name-resolution-context.h"
#include "rust-attributes.h"

#include "fold-const.h"
#include "stringpool.h"
Expand Down Expand Up @@ -158,74 +159,15 @@ HIRCompileBase::handle_attribute_proc_macro_attribute_on_fndecl (
ctx->collect_attribute_proc_macro (fndecl);
}

static std::vector<std::string>
get_attributes (const AST::Attribute &attr)
{
std::vector<std::string> result;

rust_assert (attr.get_attr_input ().get_attr_input_type ()
== Rust::AST::AttrInput::TOKEN_TREE);
const auto &tt
= static_cast<const AST::DelimTokenTree &> (attr.get_attr_input ());

// TODO: Should we rely on fixed index ? Should we search for the
// attribute tokentree instead ?

// Derive proc macros have the following format:
// #[proc_macro_derive(TraitName, attributes(attr1, attr2, attr3))]
// -~~~~~~~~ - ~~~~~~~~~~---------------------
// ^0 ^1 ^2 ^3 ^4
// - "attributes" is stored at position 3 in the token tree
// - attribute are stored in the delimited token tree in position 4
constexpr size_t attr_kw_pos = 3;
constexpr size_t attribute_list_pos = 4;

if (tt.get_token_trees ().size () > attr_kw_pos)
{
rust_assert (tt.get_token_trees ()[attr_kw_pos]->as_string ()
== "attributes");

auto attributes = static_cast<const AST::DelimTokenTree *> (
tt.get_token_trees ()[attribute_list_pos].get ());

auto &token_trees = attributes->get_token_trees ();

for (auto i = token_trees.cbegin () + 1; // Skip opening parenthesis
i < token_trees.cend ();
i += 2) // Skip comma and closing parenthesis
{
result.push_back ((*i)->as_string ());
}
}
return result;
}

static std::string
get_trait_name (const AST::Attribute &attr)
{
// Derive proc macros have the following format:
// #[proc_macro_derive(TraitName, attributes(attr1, attr2, attr3))]
// -~~~~~~~~ - ~~~~~~~~~~---------------------
// ^0 ^1 ^2 ^3 ^4
// - The trait name is stored at position 1
constexpr size_t trait_name_pos = 1;

rust_assert (attr.get_attr_input ().get_attr_input_type ()
== Rust::AST::AttrInput::TOKEN_TREE);
const auto &tt
= static_cast<const AST::DelimTokenTree &> (attr.get_attr_input ());
return tt.get_token_trees ()[trait_name_pos]->as_string ();
}

void
HIRCompileBase::handle_derive_proc_macro_attribute_on_fndecl (
tree fndecl, const AST::Attribute &attr)
{
handle_proc_macro_common (fndecl, attr);

attr.get_attr_input ().parse_to_meta_item ();
CustomDeriveInfo macro
= {fndecl, get_trait_name (attr), get_attributes (attr)};
CustomDeriveInfo macro = {fndecl, Analysis::Attributes::get_trait_name (attr),
Analysis::Attributes::get_attributes (attr)};
ctx->collect_derive_proc_macro (macro);
}

Expand Down
59 changes: 59 additions & 0 deletions gcc/rust/util/rust-attributes.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,65 @@ Attributes::is_known (const std::string &attribute_path)
return !lookup.is_error ();
}

std::vector<std::string>
Attributes::get_attributes (const AST::Attribute &attr)
{
std::vector<std::string> result;

rust_assert (attr.get_attr_input ().get_attr_input_type ()
== Rust::AST::AttrInput::TOKEN_TREE);
const auto &tt
= static_cast<const AST::DelimTokenTree &> (attr.get_attr_input ());

// TODO: Should we rely on fixed index ? Should we search for the
// attribute tokentree instead ?

// Derive proc macros have the following format:
// #[proc_macro_derive(TraitName, attributes(attr1, attr2, attr3))]
// -~~~~~~~~ - ~~~~~~~~~~---------------------
// ^0 ^1 ^2 ^3 ^4
// - "attributes" is stored at position 3 in the token tree
// - attribute are stored in the delimited token tree in position 4
constexpr size_t attr_kw_pos = 3;
constexpr size_t attribute_list_pos = 4;

if (tt.get_token_trees ().size () > attr_kw_pos)
{
rust_assert (tt.get_token_trees ()[attr_kw_pos]->as_string ()
== "attributes");

auto attributes = static_cast<const AST::DelimTokenTree *> (
tt.get_token_trees ()[attribute_list_pos].get ());

auto &token_trees = attributes->get_token_trees ();

for (auto i = token_trees.cbegin () + 1; // Skip opening parenthesis
i < token_trees.cend ();
i += 2) // Skip comma and closing parenthesis
{
result.push_back ((*i)->as_string ());
}
}
return result;
}

std::string
Attributes::get_trait_name (const AST::Attribute &attr)
{
// Derive proc macros have the following format:
// #[proc_macro_derive(TraitName, attributes(attr1, attr2, attr3))]
// -~~~~~~~~ - ~~~~~~~~~~---------------------
// ^0 ^1 ^2 ^3 ^4
// - The trait name is stored at position 1
constexpr size_t trait_name_pos = 1;

rust_assert (attr.get_attr_input ().get_attr_input_type ()
== Rust::AST::AttrInput::TOKEN_TREE);
const auto &tt
= static_cast<const AST::DelimTokenTree &> (attr.get_attr_input ());
return tt.get_token_trees ()[trait_name_pos]->as_string ();
}

using Attrs = Values::Attributes;

// https://doc.rust-lang.org/stable/nightly-rustc/src/rustc_feature/builtin_attrs.rs.html#248
Expand Down
2 changes: 2 additions & 0 deletions gcc/rust/util/rust-attributes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ class Attributes
{
public:
static bool is_known (const std::string &attribute_path);
static std::string get_trait_name (const AST::Attribute &attr);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not keen to adding those functions in the attribute class as here attribute means two different things. The first one is the attribute as we all know it in rust #[attribute] (1), but the second one is specific to proc macros (2). On one hand moving it inside the attribute class seems appropriate because it is indeed part of proc macro declaration which are attributes(1) but on the other hand it might confuse people as it really only works for (2)

static std::vector<std::string> get_attributes (const AST::Attribute &attr);
};

enum CompilerPass
Expand Down
Loading