diff options
| author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2024-01-10 16:44:09 +0100 |
|---|---|---|
| committer | P-E-P <32375388+P-E-P@users.noreply.github.com> | 2024-03-26 17:35:02 +0000 |
| commit | 1230910d4fc6f8ee8dcec84223d13fd4be812bdd (patch) | |
| tree | 91890c5061410818dd0dcc06c593f7b98fbc2af8 | |
| parent | f8a6a624097e701f09912198da1a6735eac514ab (diff) | |
| download | gcc-1230910d4fc6f8ee8dcec84223d13fd4be812bdd.zip gcc-1230910d4fc6f8ee8dcec84223d13fd4be812bdd.tar.gz gcc-1230910d4fc6f8ee8dcec84223d13fd4be812bdd.tar.bz2 | |
Shape up name resolver for normal direct calls
Direct function calls did not work anymore due to the transition to the
new resolver.
gcc/rust/ChangeLog:
* checks/lints/rust-lint-marklive.cc (MarkLive::find_ref_node_id):
Add code path for the resolver 2.0
* resolve/rust-late-name-resolver-2.0.cc (Late::visit): Remove failing
label context resolve call.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
| -rw-r--r-- | gcc/rust/checks/lints/rust-lint-marklive.cc | 23 | ||||
| -rw-r--r-- | gcc/rust/resolve/rust-late-name-resolver-2.0.cc | 3 |
2 files changed, 21 insertions, 5 deletions
diff --git a/gcc/rust/checks/lints/rust-lint-marklive.cc b/gcc/rust/checks/lints/rust-lint-marklive.cc index 8787a9d..1a0a0a2 100644 --- a/gcc/rust/checks/lints/rust-lint-marklive.cc +++ b/gcc/rust/checks/lints/rust-lint-marklive.cc @@ -20,8 +20,10 @@ // from live codes are live, and everything else is dead. #include "rust-lint-marklive.h" +#include "options.h" #include "rust-hir-full.h" #include "rust-name-resolver.h" +#include "rust-immutable-name-resolution-context.h" namespace Rust { namespace Analysis { @@ -270,12 +272,25 @@ MarkLive::mark_hir_id (HirId id) void MarkLive::find_ref_node_id (NodeId ast_node_id, NodeId &ref_node_id) { - if (!resolver->lookup_resolved_name (ast_node_id, &ref_node_id)) + if (flag_name_resolution_2_0) { - if (!resolver->lookup_resolved_type (ast_node_id, &ref_node_id)) + auto nr_ctx + = Resolver2_0::ImmutableNameResolutionContext::get ().resolver (); + + nr_ctx.lookup (ast_node_id).map ([&ref_node_id] (NodeId resolved) { + ref_node_id = resolved; + }); + } + else + { + if (!resolver->lookup_resolved_name (ast_node_id, &ref_node_id)) { - bool ok = resolver->lookup_resolved_misc (ast_node_id, &ref_node_id); - rust_assert (ok); + if (!resolver->lookup_resolved_type (ast_node_id, &ref_node_id)) + { + bool ok + = resolver->lookup_resolved_misc (ast_node_id, &ref_node_id); + rust_assert (ok); + } } } } diff --git a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc index ee06c4e..68eb88a 100644 --- a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc +++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc @@ -196,8 +196,9 @@ Late::visit (AST::PathInExpression &expr) // in a function item` error here? // do we emit it in `get<Namespace::Labels>`? - auto label = ctx.labels.resolve_path (expr.get_segments ()); auto value = ctx.values.resolve_path (expr.get_segments ()); + + ctx.map_usage (Usage (expr.get_node_id ()), Definition (*value)); } void |