Merge #796

796: Handle forward declared items within blocks r=philberty a=philberty

This changes the resolution in BlockExpr's to iterate the Items then Stmts
but we might want to handle this by desugaring the HIR BlockExpr to have
items then stmts to ensure we type resolve the items before the stmts.

Fixes #531

Co-authored-by: Philip Herron <philip.herron@embecosm.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/gcc/rust/resolve/rust-ast-resolve.cc b/gcc/rust/resolve/rust-ast-resolve.cc
index af04aeb..921b77c 100644
--- a/gcc/rust/resolve/rust-ast-resolve.cc
+++ b/gcc/rust/resolve/rust-ast-resolve.cc
@@ -349,7 +349,16 @@ ResolveExpr::visit (AST::BlockExpr &expr)
   resolver->push_new_label_rib (resolver->get_type_scope ().peek ());
 
   for (auto &s : expr.get_statements ())
-    ResolveStmt::go (s.get (), s->get_node_id ());
+    {
+      if (s->is_item ())
+	ResolveStmt::go (s.get (), s->get_node_id ());
+    }
+
+  for (auto &s : expr.get_statements ())
+    {
+      if (!s->is_item ())
+	ResolveStmt::go (s.get (), s->get_node_id ());
+    }
 
   if (expr.has_tail_expr ())
     ResolveExpr::go (expr.get_tail_expr ().get (), expr.get_node_id ());