From ffe03a09204b8a9918de701ab3720db030b4658c Mon Sep 17 00:00:00 2001 From: Pierre-Emmanuel Patry Date: Fri, 24 Jan 2025 16:02:10 +0100 Subject: [PATCH] Add captures for ClosureExprInnerTyped with nr2 Captures were only processed for regular ClosureExprInner. gcc/rust/ChangeLog: * resolve/rust-late-name-resolver-2.0.cc (Late::visit): Add ClosureExprInnerTyped visit implementation. (add_captures): Add a function to avoid code duplication. * resolve/rust-late-name-resolver-2.0.h: Add function prototype. Signed-off-by: Pierre-Emmanuel Patry --- gcc/rust/resolve/rust-late-name-resolver-2.0.cc | 17 +++++++++++++++-- gcc/rust/resolve/rust-late-name-resolver-2.0.h | 1 + 2 files changed, 16 insertions(+), 2 deletions(-) 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 1e7f9f1546c..b0364d10725 100644 --- a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc +++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc @@ -390,8 +390,9 @@ Late::visit (AST::GenericArg &arg) DefaultResolver::visit (arg); } -void -Late::visit (AST::ClosureExprInner &closure) +template +static void +add_captures (Closure &closure, NameResolutionContext &ctx) { auto vals = ctx.values.peek ().get_values (); for (auto &val : vals) @@ -399,7 +400,19 @@ Late::visit (AST::ClosureExprInner &closure) ctx.mappings.add_capture (closure.get_node_id (), val.second.get_node_id ()); } +} +void +Late::visit (AST::ClosureExprInner &closure) +{ + add_captures (closure, ctx); + DefaultResolver::visit (closure); +} + +void +Late::visit (AST::ClosureExprInnerTyped &closure) +{ + add_captures (closure, ctx); DefaultResolver::visit (closure); } diff --git a/gcc/rust/resolve/rust-late-name-resolver-2.0.h b/gcc/rust/resolve/rust-late-name-resolver-2.0.h index 3030261f10b..c7799359624 100644 --- a/gcc/rust/resolve/rust-late-name-resolver-2.0.h +++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.h @@ -57,6 +57,7 @@ class Late : public DefaultResolver void visit (AST::GenericArgs &) override; void visit (AST::GenericArg &); void visit (AST::ClosureExprInner &) override; + void visit (AST::ClosureExprInnerTyped &) override; private: /* Setup Rust's builtin types (u8, i32, !...) in the resolver */