Add missing accessors for enum items

2 files changed, 20 insertions, 4 deletions

diff --git a/gcc/rust/hir/tree/rust-hir-item.h b/gcc/rust/hir/tree/rust-hir-item.h
index 9b8793f..12d0c20 100644
--- a/gcc/rust/hir/tree/rust-hir-item.h
+++ b/gcc/rust/hir/tree/rust-hir-item.h
@@ -1694,12 +1694,12 @@ public:
     return std::unique_ptr<EnumItem> (clone_item_impl ());
   }
 
-  virtual std::string as_string () const;
+  virtual std::string as_string () const override;
 
   // not pure virtual as not abstract
-  virtual void accept_vis (HIRVisitor &vis);
+  virtual void accept_vis (HIRVisitor &vis) override;
 
-  Location get_locus () const { return locus; }
+  Location get_locus () const override { return locus; }
 
   Identifier get_identifier () const { return variant_name; }
 
@@ -1729,6 +1729,8 @@ public:
 
   void accept_vis (HIRVisitor &vis) override;
 
+  std::vector<TupleField> &get_tuple_fields () { return tuple_fields; }
+
 protected:
   // Clone function implementation as (not pure) virtual method
   EnumItemTuple *clone_item_impl () const override
@@ -1759,6 +1761,8 @@ public:
 
   void accept_vis (HIRVisitor &vis) override;
 
+  std::vector<StructField> &get_struct_fields () { return struct_fields; }
+
 protected:
   // Clone function implementation as (not pure) virtual method
   EnumItemStruct *clone_item_impl () const override
@@ -1805,6 +1809,8 @@ public:
 
   void accept_vis (HIRVisitor &vis) override;
 
+  std::unique_ptr<Expr> &get_discriminant_expression () { return expression; }
+
 protected:
   // Clone function implementation as (not pure) virtual method
   EnumItemDiscriminant *clone_item_impl () const override
@@ -1899,6 +1905,16 @@ public:
 
   Identifier get_identifier () const { return enum_name; }
 
+  std::vector<std::unique_ptr<GenericParam>> &get_generic_params ()
+  {
+    return generic_params;
+  }
+
+  const std::vector<std::unique_ptr<EnumItem>> &get_variants () const
+  {
+    return items;
+  }
+
 protected:
   /* Use covariance to implement clone function as returning this object
    * rather than base */
diff --git a/gcc/rust/hir/tree/rust-hir.h b/gcc/rust/hir/tree/rust-hir.h
index 667f4d08..d7977b4 100644
--- a/gcc/rust/hir/tree/rust-hir.h
+++ b/gcc/rust/hir/tree/rust-hir.h
@@ -127,7 +127,7 @@ public:
     return std::unique_ptr<Item> (clone_item_impl ());
   }
 
-  std::string as_string () const;
+  std::string as_string () const override;
 
   /* Adds crate names to the vector passed by reference, if it can
    * (polymorphism). */