From fc024ea79deb5a9ec3cfd68b59719bef52db49ff Mon Sep 17 00:00:00 2001 From: Pierre-Emmanuel Patry Date: Fri, 1 Sep 2023 13:14:09 +0200 Subject: gccrs: Unify raw attribute values Attribute values were used as raw string, this is error prone and makes renaming harder. Using a constexpr instead will leverage the power of the compiler and emit an error when an incorrect builtin attribute value is used. gcc/rust/ChangeLog: * ast/rust-ast.cc (Attribute::check_cfg_predicate): Change raw string to constexpr call. (Attribute::separate_cfg_attrs): Likewise. * backend/rust-compile-base.cc (should_mangle_item): Likewise. (HIRCompileBase::setup_fndecl): Likewise. (HIRCompileBase::handle_cold_attribute_on_fndecl): Likewise. * checks/errors/privacy/rust-privacy-reporter.cc (find_proc_macro_attribute): Likewise. * checks/errors/rust-unsafe-checker.cc (check_target_attr): Likewise. * expand/rust-cfg-strip.cc (fails_cfg): Likewise. (fails_cfg_with_expand): Likewise. (expand_cfg_attrs): Likewise. * expand/rust-macro-builtins.cc: Likewise. * hir/rust-ast-lower-base.cc (ASTLoweringBase::handle_outer_attributes): Likewise. (ASTLoweringBase::lower_macro_definition): Likewise. * hir/rust-hir-dump.cc (Dump::visit): Likewise. * parse/rust-parse-impl.h (Parser::parse_doc_comment): Likewise. * parse/rust-parse.cc (extract_module_path): Likewise. * resolve/rust-early-name-resolver.cc (is_macro_use_module): Likewise. (EarlyNameResolver::visit): Likewise. * resolve/rust-toplevel-name-resolver-2.0.cc (is_macro_export): Likwise. * rust-session-manager.cc (Session::injection): Likewise. * typecheck/rust-hir-type-check-base.cc (TypeCheckBase::parse_repr_options): Likewise. * util/rust-attributes.cc (is_proc_macro_type): Likewise. (AttributeChecker::check_attribute): Likewise. (AttributeChecker::visit): Likewise. * util/rust-hir-map.cc (Mappings::insert_macro_def): Likewise. * util/rust-attribute-values.h: New file. Signed-off-by: Pierre-Emmanuel Patry --- gcc/rust/backend/rust-compile-base.cc | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'gcc/rust/backend') diff --git a/gcc/rust/backend/rust-compile-base.cc b/gcc/rust/backend/rust-compile-base.cc index 492588d..c11b6cc 100644 --- a/gcc/rust/backend/rust-compile-base.cc +++ b/gcc/rust/backend/rust-compile-base.cc @@ -30,6 +30,7 @@ #include "rust-hir-path-probe.h" #include "rust-type-util.h" #include "rust-compile-implitem.h" +#include "rust-attribute-values.h" #include "fold-const.h" #include "stringpool.h" @@ -42,7 +43,9 @@ namespace Compile { bool inline should_mangle_item (const tree fndecl) { - return lookup_attribute ("no_mangle", DECL_ATTRIBUTES (fndecl)) == NULL_TREE; + return lookup_attribute (Values::Attributes::NO_MANGLE, + DECL_ATTRIBUTES (fndecl)) + == NULL_TREE; } void @@ -69,15 +72,17 @@ HIRCompileBase::setup_fndecl (tree fndecl, bool is_main_entry_point, // is it inline? for (const auto &attr : attrs) { - bool is_inline = attr.get_path ().as_string ().compare ("inline") == 0; + bool is_inline + = attr.get_path ().as_string () == Values::Attributes::INLINE; bool is_must_use - = attr.get_path ().as_string ().compare ("must_use") == 0; - bool is_cold = attr.get_path ().as_string ().compare ("cold") == 0; + = attr.get_path ().as_string () == Values::Attributes::MUST_USE; + bool is_cold = attr.get_path ().as_string () == Values::Attributes::COLD; bool is_link_section - = attr.get_path ().as_string ().compare ("link_section") == 0; - bool no_mangle = attr.get_path ().as_string ().compare ("no_mangle") == 0; + = attr.get_path ().as_string () == Values::Attributes::LINK_SECTION; + bool no_mangle + = attr.get_path ().as_string () == Values::Attributes::NO_MANGLE; bool is_deprecated - = attr.get_path ().as_string ().compare ("deprecated") == 0; + = attr.get_path ().as_string () == Values::Attributes::DEPRECATED; if (is_inline) { @@ -113,7 +118,7 @@ HIRCompileBase::handle_cold_attribute_on_fndecl (tree fndecl, // simple #[cold] if (!attr.has_attr_input ()) { - tree cold = get_identifier ("cold"); + tree cold = get_identifier (Values::Attributes::COLD); // this will get handled by the GCC backend later DECL_ATTRIBUTES (fndecl) = tree_cons (cold, NULL_TREE, DECL_ATTRIBUTES (fndecl)); @@ -160,8 +165,9 @@ HIRCompileBase::handle_no_mangle_attribute_on_fndecl ( return; } - DECL_ATTRIBUTES (fndecl) = tree_cons (get_identifier ("no_mangle"), NULL_TREE, - DECL_ATTRIBUTES (fndecl)); + DECL_ATTRIBUTES (fndecl) + = tree_cons (get_identifier (Values::Attributes::NO_MANGLE), NULL_TREE, + DECL_ATTRIBUTES (fndecl)); } void @@ -223,7 +229,7 @@ HIRCompileBase::handle_deprecated_attribute_on_fndecl ( { tree attr_list = build_tree_list (NULL_TREE, value); DECL_ATTRIBUTES (fndecl) - = tree_cons (get_identifier ("deprecated"), attr_list, + = tree_cons (get_identifier (Values::Attributes::DEPRECATED), attr_list, DECL_ATTRIBUTES (fndecl)); } } -- cgit v1.1