diff options
| author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2025-01-24 16:02:10 +0100 |
|---|---|---|
| committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2025-03-24 13:06:53 +0100 |
| commit | cd30e006462c0a8934ec9f4279d43d4803a20395 (patch) | |
| tree | 2ebd48e3973c8571028d24afea996fc860dde1f6 | |
| parent | 8c95b5062dd5703bed1b5f5b69e76a9443475da9 (diff) | |
| download | gcc-cd30e006462c0a8934ec9f4279d43d4803a20395.zip gcc-cd30e006462c0a8934ec9f4279d43d4803a20395.tar.gz gcc-cd30e006462c0a8934ec9f4279d43d4803a20395.tar.bz2 | |
gccrs: 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 <pierre-emmanuel.patry@embecosm.com>
| -rw-r--r-- | gcc/rust/resolve/rust-late-name-resolver-2.0.cc | 17 | ||||
| -rw-r--r-- | 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 0779736..bc973a0 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 bf6d193..31303eb 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 */ |