From: Pierre-Emmanuel Patry <pierre-emmanuel.pa...@embecosm.com> 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 <pierre-emmanuel.pa...@embecosm.com> --- 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 0779736809e..bc973a009f0 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 <class Closure> +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 bf6d1935d3d..31303eb4fb2 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 @@ public: 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 */ -- 2.45.2