Merge #728

728: Remove `AST::BlockExpr` lambda and add `get_statements` r=philberty a=wan-nyan-wan

This PR Fixes #724.

This patch removes lambda iterators in `AST::BlockExpr` and replace these with `get_statements`. These lambda iterators need to be removed they make working with the IR's more complex for static analysis. 

Co-authored-by: wan-nyan-wan <distributed.system.love@gmail.com>

1 files changed, 11 insertions, 10 deletions

diff --git a/gcc/rust/hir/rust-ast-lower.cc b/gcc/rust/hir/rust-ast-lower.cc
index ed0774c..3a675b7 100644
--- a/gcc/rust/hir/rust-ast-lower.cc
+++ b/gcc/rust/hir/rust-ast-lower.cc
@@ -64,16 +64,17 @@ ASTLoweringBlock::visit (AST::BlockExpr &expr)
 {
   std::vector<std::unique_ptr<HIR::Stmt> > block_stmts;
   bool block_did_terminate = false;
-  expr.iterate_stmts ([&] (AST::Stmt *s) mutable -> bool {
-    if (block_did_terminate)
-      rust_warning_at (s->get_locus (), 0, "unreachable statement");
-
-    bool terminated = false;
-    auto translated_stmt = ASTLoweringStmt::translate (s, &terminated);
-    block_stmts.push_back (std::unique_ptr<HIR::Stmt> (translated_stmt));
-    block_did_terminate |= terminated;
-    return true;
-  });
+
+  for (auto &s : expr.get_statements ())
+    {
+      if (block_did_terminate)
+	rust_warning_at (s->get_locus (), 0, "unreachable statement");
+
+      bool terminated = false;
+      auto translated_stmt = ASTLoweringStmt::translate (s.get (), &terminated);
+      block_stmts.push_back (std::unique_ptr<HIR::Stmt> (translated_stmt));
+      block_did_terminate |= terminated;
+    }
 
   if (expr.has_tail_expr () && block_did_terminate)
     {