diff options
| author | Owen Avery <powerboat9.gamer@gmail.com> | 2024-10-15 15:34:06 -0400 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2024-10-24 08:07:22 +0000 |
| commit | e7de54ddae5de2d38495dc98c3dd8a31a5092f62 (patch) | |
| tree | 706d95c55939405be37773382f3f1c735f135b52 /gcc | |
| parent | b7eb4b0af5ed4e1ab29d5638689194026b4e33e8 (diff) | |
| download | gcc-e7de54ddae5de2d38495dc98c3dd8a31a5092f62.zip gcc-e7de54ddae5de2d38495dc98c3dd8a31a5092f62.tar.gz gcc-e7de54ddae5de2d38495dc98c3dd8a31a5092f62.tar.bz2 | |
Use name resolver 2.0 in pattern checker
gcc/rust/ChangeLog:
* checks/errors/rust-hir-pattern-analysis.cc: Add includes.
(PatternChecker::visit): Use name resolver 2.0 when enabled.
Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/checks/errors/rust-hir-pattern-analysis.cc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/gcc/rust/checks/errors/rust-hir-pattern-analysis.cc b/gcc/rust/checks/errors/rust-hir-pattern-analysis.cc index fdbc6e8..f46f429 100644 --- a/gcc/rust/checks/errors/rust-hir-pattern-analysis.cc +++ b/gcc/rust/checks/errors/rust-hir-pattern-analysis.cc @@ -26,6 +26,10 @@ #include "rust-mapping-common.h" #include "rust-system.h" #include "rust-tyty.h" +#include "rust-immutable-name-resolution-context.h" + +// for flag_name_resolution_2_0 +#include "options.h" namespace Rust { namespace Analysis { @@ -234,7 +238,17 @@ PatternChecker::visit (CallExpr &expr) NodeId ast_node_id = expr.get_fnexpr ()->get_mappings ().get_nodeid (); NodeId ref_node_id; - if (!resolver.lookup_resolved_name (ast_node_id, &ref_node_id)) + if (flag_name_resolution_2_0) + { + auto &nr_ctx + = Resolver2_0::ImmutableNameResolutionContext::get ().resolver (); + + if (auto id = nr_ctx.lookup (ast_node_id)) + ref_node_id = *id; + else + return; + } + else if (!resolver.lookup_resolved_name (ast_node_id, &ref_node_id)) return; if (auto definition_id = mappings.lookup_node_to_hir (ref_node_id)) |