Add is_item helper to AST and HIR

BlockExpr can contain Items and Stmts this allows us to differentiate
between them on the Stmt level.

4 files changed, 20 insertions, 0 deletions

diff --git a/gcc/rust/ast/rust-ast.h b/gcc/rust/ast/rust-ast.h
index 95e4738..72f2609 100644
--- a/gcc/rust/ast/rust-ast.h
+++ b/gcc/rust/ast/rust-ast.h
@@ -822,6 +822,8 @@ public:
   virtual bool is_marked_for_strip () const = 0;
   NodeId get_node_id () const { return node_id; }
 
+  virtual bool is_item () const = 0;
+
 protected:
   Stmt () : node_id (Analysis::Mappings::get ()->get_next_node_id ()) {}
 
@@ -847,6 +849,8 @@ public:
   add_crate_name (std::vector<std::string> &names ATTRIBUTE_UNUSED) const
   {}
 
+  bool is_item () const override final { return true; }
+
 protected:
   // Clone function implementation as pure virtual method
   virtual Item *clone_item_impl () const = 0;
diff --git a/gcc/rust/ast/rust-stmt.h b/gcc/rust/ast/rust-stmt.h
index b83ca11..a1b4e57 100644
--- a/gcc/rust/ast/rust-stmt.h
+++ b/gcc/rust/ast/rust-stmt.h
@@ -46,6 +46,8 @@ public:
   void mark_for_strip () override { marked_for_strip = true; }
   bool is_marked_for_strip () const override { return marked_for_strip; }
 
+  bool is_item () const override final { return false; }
+
 protected:
   /* Use covariance to implement clone function as returning this object rather
    * than base */
@@ -169,6 +171,8 @@ public:
     return type;
   }
 
+  bool is_item () const override final { return false; }
+
 protected:
   /* Use covariance to implement clone function as returning this object rather
    * than base */
@@ -186,6 +190,8 @@ class ExprStmt : public Stmt
 public:
   Location get_locus () const override final { return locus; }
 
+  bool is_item () const override final { return false; }
+
 protected:
   ExprStmt (Location locus) : locus (locus) {}
 };
diff --git a/gcc/rust/hir/tree/rust-hir-stmt.h b/gcc/rust/hir/tree/rust-hir-stmt.h
index cc61142..29e98fa 100644
--- a/gcc/rust/hir/tree/rust-hir-stmt.h
+++ b/gcc/rust/hir/tree/rust-hir-stmt.h
@@ -41,6 +41,8 @@ public:
 
   void accept_vis (HIRVisitor &vis) override;
 
+  bool is_item () const override final { return false; }
+
 protected:
   /* Use covariance to implement clone function as returning this object rather
    * than base */
@@ -119,6 +121,8 @@ public:
 
   HIR::Pattern *get_pattern () { return variables_pattern.get (); }
 
+  bool is_item () const override final { return false; }
+
 protected:
   /* Use covariance to implement clone function as returning this object rather
    * than base */
@@ -136,6 +140,8 @@ class ExprStmt : public Stmt
 public:
   Location get_locus () const override final { return locus; }
 
+  bool is_item () const override final { return false; }
+
 protected:
   ExprStmt (Analysis::NodeMapping mappings, Location locus)
     : Stmt (std::move (mappings)), locus (locus)
diff --git a/gcc/rust/hir/tree/rust-hir.h b/gcc/rust/hir/tree/rust-hir.h
index d7977b4..d001eb1 100644
--- a/gcc/rust/hir/tree/rust-hir.h
+++ b/gcc/rust/hir/tree/rust-hir.h
@@ -104,6 +104,8 @@ public:
 
   const Analysis::NodeMapping &get_mappings () const { return mappings; }
 
+  virtual bool is_item () const = 0;
+
 protected:
   Stmt (Analysis::NodeMapping mappings) : mappings (std::move (mappings)) {}
 
@@ -140,6 +142,8 @@ public:
   AST::AttrVec &get_outer_attrs () { return outer_attrs; }
   const AST::AttrVec &get_outer_attrs () const { return outer_attrs; }
 
+  bool is_item () const override final { return true; }
+
 protected:
   // Constructor
   Item (Analysis::NodeMapping mappings,