From 13557769abc6f575fa9cd994849c20ccf60dda52 Mon Sep 17 00:00:00 2001 From: Pierre-Emmanuel Patry Date: Mon, 19 Jun 2023 14:01:13 +0200 Subject: [PATCH] gccrs: 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 --- gcc/rust/expand/rust-expand-visitor.cc | 6 +++--- 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 d79aeac440b6..28ff3df31487 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> &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 e7e303b44b4f..a88c91e81f8e 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> &values); - void expand_inner_stmts (AST::BlockExpr &expr, - std::vector> &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 -- 2.47.2