procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gccrs: Change ABI setup and add gccrs_proc_macro attr

Browse source 
Change the way the ABI is setup on a function to avoid duplicates. ABI
is setup by the setup function only now. Add a new attribute to the
function "gccrs_proc_macro" in order to differentiate it from another
type of function.

gcc/rust/ChangeLog:

	* backend/rust-compile-base.cc (handle_proc_macro_common): Add
	new attribute "gccrs_proc_macro" to all procedural macro
	functions.
	(get_abi): Add a function to retrieve the correct ABI depending
	on wether the function is a proc macro or not.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
This commit is contained in:
Pierre-Emmanuel Patry 2023-09-04 14:23:10 +02:00 • committed by Arthur Cohen
parent ce7688d7b0
commit 193b0780d5
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gcc/rust/backend/rust-compile-base.cc
View file

@ -133,8 +133,8 @@ HIRCompileBase::setup_fndecl (tree fndecl, bool is_main_entry_point,
static void
handle_proc_macro_common (tree fndecl, const AST::Attribute &attr)
{
DECL_ATTRIBUTES (fndecl)
= tree_cons (get_identifier ("cdecl"), NULL, DECL_ATTRIBUTES (fndecl));
DECL_ATTRIBUTES (fndecl) = tree_cons (get_identifier ("gccrs_proc_macro"),
NULL, DECL_ATTRIBUTES (fndecl));
}
void
@ -591,6 +591,21 @@ HIRCompileBase::compile_function_body (tree fndecl,
}
}
static ABI
get_abi (const AST::AttrVec &outer_attrs,
const HIR::FunctionQualifiers &qualifiers)
{
bool is_proc_macro = std::any_of (outer_attrs.cbegin (), outer_attrs.cend (),
[] (const AST::Attribute &attr) {
auto path = attr.get_path ().as_string ();
return path == "proc_macro"
|| path == "proc_macro_derive"
|| path == "proc_macro_attribute";
});
return is_proc_macro ? ABI::CDECL : qualifiers.get_abi ();
}
tree
HIRCompileBase::compile_function (
const std::string &fn_name, HIR::SelfParam &self_param,
@ -613,7 +628,7 @@ HIRCompileBase::compile_function (
setup_fndecl (fndecl, is_main_fn, fntype->has_substitutions_defined (),
visibility, qualifiers, outer_attrs);
setup_abi_options (fndecl, qualifiers.get_abi ());
setup_abi_options (fndecl, get_abi (outer_attrs, qualifiers));
// conditionally mangle the function name
bool should_mangle = should_mangle_item (fndecl);