Skip to content

[WIP] Turn Name Resolution 2.0 on by default #2875

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

Closed
powerboat9 wants to merge 2 commits into from
Closed

[WIP] Turn Name Resolution 2.0 on by default #2875

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
406d36b
skip builtin trait resolution
powerboat9 Feb 29, 2024
dde8bce
map builtin macros
powerboat9 Feb 29, 2024
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
33 changes: 33 additions & 0 deletions gcc/rust/resolve/rust-early-name-resolver-2.0.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,25 @@ Early::insert_once (AST::MacroInvocation &invocation, NodeId resolved)
{
// TODO: Should we use `ctx.mark_resolved()`?
auto definition = ctx.mappings.lookup_macro_def (resolved);
rust_assert (definition.has_value ());

// TODO: make sure this is proper
// was copied from old early name resolver
auto &outer_attrs = definition.value ()->get_outer_attrs ();
bool is_builtin
= std::any_of (outer_attrs.begin (), outer_attrs.end (),
[] (AST::Attribute attr) {
return attr.get_path ()
== Values::Attributes::RUSTC_BUILTIN_MACRO;
});

if (is_builtin)
{
auto builtin_kind
= builtin_macro_from_string (definition.value ()->get_rule_name ().as_string ());
rust_assert (builtin_kind);
invocation.map_to_builtin (*builtin_kind);
}

if (!ctx.mappings.lookup_macro_invocation (invocation))
ctx.mappings.insert_macro_invocation (invocation, definition.value ());
Expand Down Expand Up @@ -314,6 +333,20 @@ Early::visit_attributes (std::vector<AST::Attribute> &attrs)
auto traits = attr.get_traits_to_derive ();
for (auto &trait : traits)
{
// HACK: skip resolution of derive macros which look like
// builtins
//
// This does not properly handle code such as
// use Clone as Foo;
// #[derive(Foo)]
// struct S;
//
// Builtin derive macros should probably be handled
// in a fashion more similar to custom derive macros
if (MacroBuiltin::builtins.lookup (trait.get ().as_string ())
.has_value ())
continue;

auto definition
= ctx.resolve_path (trait.get (), Namespace::Macros);
if (!definition.has_value ())
Expand Down
Loading