diff options
| author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2023-06-19 14:01:13 +0200 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2023-06-22 08:49:35 +0000 |
| commit | be6d7343a5dfd535af91ad5a2e4e08ffef2d2013 (patch) | |
| tree | c2fc3a34a41a1b0c5b05a917a6e3e616e0e18416 | |
| parent | d37a1d547014e87cf0fac0171974dca4a9d0db5f (diff) | |
| download | gcc-be6d7343a5dfd535af91ad5a2e4e08ffef2d2013.zip gcc-be6d7343a5dfd535af91ad5a2e4e08ffef2d2013.tar.gz gcc-be6d7343a5dfd535af91ad5a2e4e08ffef2d2013.tar.bz2 | |
expand: Merge arguments into one
The second argument could be derived from the first one, the second
argument is hence useless as the first argument alone could be kept to
access it's data.
gcc/rust/ChangeLog:
* expand/rust-expand-visitor.cc (ExpandVisitor::expand_inner_stmts):
Remove second argument.
(ExpandVisitor::visit): Remove argument from function call.
* expand/rust-expand-visitor.h: Update function prototype.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
| -rw-r--r-- | gcc/rust/expand/rust-expand-visitor.cc | 6 | ||||
| -rw-r--r-- | gcc/rust/expand/rust-expand-visitor.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/gcc/rust/expand/rust-expand-visitor.cc b/gcc/rust/expand/rust-expand-visitor.cc index d79aeac..28ff3df 100644 --- a/gcc/rust/expand/rust-expand-visitor.cc +++ b/gcc/rust/expand/rust-expand-visitor.cc @@ -286,9 +286,9 @@ ExpandVisitor::expand_inner_items ( } void -ExpandVisitor::expand_inner_stmts ( - AST::BlockExpr &expr, std::vector<std::unique_ptr<AST::Stmt>> &stmts) +ExpandVisitor::expand_inner_stmts (AST::BlockExpr &expr) { + auto &stmts = expr.get_statements (); expander.push_context (MacroExpander::ContextType::STMT); for (auto it = stmts.begin (); it != stmts.end (); it++) @@ -834,7 +834,7 @@ ExpandVisitor::visit (AST::ClosureExprInner &expr) void ExpandVisitor::visit (AST::BlockExpr &expr) { - expand_inner_stmts (expr, expr.get_statements ()); + expand_inner_stmts (expr); expand_tail_expr (expr, expander); if (expr.has_tail_expr ()) diff --git a/gcc/rust/expand/rust-expand-visitor.h b/gcc/rust/expand/rust-expand-visitor.h index e7e303b..a88c91e 100644 --- a/gcc/rust/expand/rust-expand-visitor.h +++ b/gcc/rust/expand/rust-expand-visitor.h @@ -158,8 +158,7 @@ public: * @param values Vector of values to mutate in-place and append into */ void expand_inner_items (std::vector<std::unique_ptr<AST::Item>> &values); - void expand_inner_stmts (AST::BlockExpr &expr, - std::vector<std::unique_ptr<AST::Stmt>> &values); + void expand_inner_stmts (AST::BlockExpr &expr); // TODO: See if possible to make more specialization for Impl items, Block // stmts etc? This could allow us to remove expand_macro_children or at least |