hir: Remove EnumItemDiscriminant from HIR

varun-r-mallya · varun-r-mallya · commit d6991e24e27b · 2025-04-05T16:14:37.000+05:30
gcc/rust/ChangeLog: * ast/rust-ast-collector.cc (TokenCollector::visit): Removed. * backend/rust-compile-item.h (CompileItem::visit): Remove EnumItemDiscriminant case. * backend/rust-compile-stmt.h (CompileStmt::visit): Remove EnumItemDiscriminant case. * checks/errors/borrowck/rust-bir-builder-expr-stmt.h (BIRBuilderExprStmt::visit): Remove EnumItemDiscriminant case. * checks/errors/borrowck/rust-bir-builder-struct.h (BIRBuilderStruct::visit): Remove EnumItemDiscriminant case. * checks/errors/borrowck/rust-function-collector.h (FunctionCollector::visit): Remove EnumItemDiscriminant case. * checks/errors/privacy/rust-privacy-reporter.cc (PrivacyReporter::visit): Remove EnumItemDiscriminant implementation. * checks/errors/privacy/rust-privacy-reporter.h (PrivacyReporter::visit): Remove EnumItemDiscriminant declaration. * checks/errors/rust-const-checker.cc (ConstChecker::visit): Remove EnumItemDiscriminant implementation. * checks/errors/rust-const-checker.h (ConstChecker::visit): Remove EnumItemDiscriminant declaration. * checks/errors/rust-hir-pattern-analysis.cc (PatternChecker::visit): Remove EnumItemDiscriminant implementation. * checks/errors/rust-hir-pattern-analysis.h (PatternChecker::visit): Remove EnumItemDiscriminant declaration. * checks/errors/rust-unsafe-checker.cc (UnsafeChecker::visit): Remove EnumItemDiscriminant implementation. * checks/errors/rust-unsafe-checker.h (UnsafeChecker::visit): Remove EnumItemDiscriminant declaration. * hir/rust-hir-dump.cc (Dump::visit): Remove EnumItemDiscriminant implementation. * hir/rust-hir-dump.h (Dump::visit): Remove EnumItemDiscriminant declaration. * hir/tree/rust-hir-full-decls.h: Remove EnumItemDiscriminant forward declaration. * hir/tree/rust-hir-item.cc (EnumItemDiscriminant::as_string): Remove implementation. (EnumItemDiscriminant::accept_vis): Remove implementation. * hir/tree/rust-hir-item.h: Remove EnumItemDiscriminant class definition. * hir/tree/rust-hir-visitor.h (HIRFullVisitor::visit): Remove EnumItemDiscriminant declaration. (HIRStmtVisitor::visit): Remove EnumItemDiscriminant declaration. * hir/tree/rust-hir.cc (EnumItemDiscriminant::as_string): Remove implementation. (EnumItemDiscriminant::accept_vis): Remove implementation. * typecheck/rust-hir-type-check-enumitem.cc (TypeCheckEnumItem::Resolve): Remove EnumItemDiscriminant case. (TypeCheckEnumItem::visit): Remove EnumItemDiscriminant implementation. * typecheck/rust-hir-type-check-enumitem.h (TypeCheckEnumItem::visit): Remove EnumItemDiscriminant declaration. * typecheck/rust-hir-type-check-stmt.h (TypeCheckStmt::visit): Remove EnumItemDiscriminant case. Addresses #3340 Signed-off-by: varun-r-mallya <varunrmallya@gmail.com>
diff --git a/gcc/rust/backend/rust-compile-item.h b/gcc/rust/backend/rust-compile-item.h
@@ -50,7 +50,6 @@ class CompileItem : private HIRCompileBase, protected HIR::HIRStmtVisitor
   void visit (HIR::EnumItem &) override {}
   void visit (HIR::EnumItemTuple &) override {}
   void visit (HIR::EnumItemStruct &) override {}
-  void visit (HIR::EnumItemDiscriminant &) override {}
   void visit (HIR::TypePathSegmentFunction &) override {}
   void visit (HIR::TypePath &) override {}
   void visit (HIR::QualifiedPathInType &) override {}
diff --git a/gcc/rust/backend/rust-compile-stmt.h b/gcc/rust/backend/rust-compile-stmt.h
@@ -38,7 +38,6 @@ class CompileStmt : private HIRCompileBase, protected HIR::HIRStmtVisitor
   void visit (HIR::EnumItem &) override {}
   void visit (HIR::EnumItemTuple &) override {}
   void visit (HIR::EnumItemStruct &) override {}
-  void visit (HIR::EnumItemDiscriminant &) override {}
   void visit (HIR::TypePathSegmentFunction &) override {}
   void visit (HIR::TypePath &) override {}
   void visit (HIR::QualifiedPathInType &) override {}
diff --git a/gcc/rust/checks/errors/borrowck/rust-bir-builder-expr-stmt.h b/gcc/rust/checks/errors/borrowck/rust-bir-builder-expr-stmt.h
@@ -134,7 +134,6 @@ class ExprStmtBuilder final : public AbstractExprBuilder,
   void visit (HIR::EnumItemStruct &a_struct) override {}
   void visit (HIR::EnumItem &item) override {}
   void visit (HIR::TupleStruct &tuple_struct) override {}
-  void visit (HIR::EnumItemDiscriminant &discriminant) override {}
   void visit (HIR::TypePathSegmentFunction &segment) override {}
   void visit (HIR::TypePath &path) override {}
   void visit (HIR::QualifiedPathInType &path) override {}
diff --git a/gcc/rust/checks/errors/borrowck/rust-bir-builder-struct.h b/gcc/rust/checks/errors/borrowck/rust-bir-builder-struct.h
@@ -176,7 +176,6 @@ class StructBuilder : public AbstractBuilder, public HIR::HIRFullVisitor
   void visit (HIR::EnumItem &item) override { rust_unreachable (); }
   void visit (HIR::EnumItemTuple &item) override { rust_unreachable (); }
   void visit (HIR::EnumItemStruct &item) override { rust_unreachable (); }
-  void visit (HIR::EnumItemDiscriminant &item) override { rust_unreachable (); }
   void visit (HIR::Enum &enum_item) override { rust_unreachable (); }
   void visit (HIR::Union &union_item) override { rust_unreachable (); }
   void visit (HIR::ConstantItem &const_item) override { rust_unreachable (); }
diff --git a/gcc/rust/checks/errors/borrowck/rust-function-collector.h b/gcc/rust/checks/errors/borrowck/rust-function-collector.h
@@ -139,7 +139,6 @@ class FunctionCollector : public HIR::HIRFullVisitor
   void visit (HIR::EnumItem &item) override {}
   void visit (HIR::EnumItemTuple &item) override {}
   void visit (HIR::EnumItemStruct &item) override {}
-  void visit (HIR::EnumItemDiscriminant &item) override {}
   void visit (HIR::Enum &enum_item) override {}
   void visit (HIR::Union &union_item) override {}
   void visit (HIR::ConstantItem &const_item) override {}
diff --git a/gcc/rust/checks/errors/privacy/rust-privacy-reporter.cc b/gcc/rust/checks/errors/privacy/rust-privacy-reporter.cc
@@ -695,10 +695,6 @@ PrivacyReporter::visit (HIR::EnumItemStruct &)
   // TODO: Check the type
 }
 
-void
-PrivacyReporter::visit (HIR::EnumItemDiscriminant &)
-{}
-
 void
 PrivacyReporter::visit (HIR::Enum &)
 {}
diff --git a/gcc/rust/checks/errors/privacy/rust-privacy-reporter.h b/gcc/rust/checks/errors/privacy/rust-privacy-reporter.h
@@ -130,7 +130,6 @@ types
   virtual void visit (HIR::EnumItemStruct &);
   virtual void visit (HIR::EnumItem &item);
   virtual void visit (HIR::TupleStruct &tuple_struct);
-  virtual void visit (HIR::EnumItemDiscriminant &);
   virtual void visit (HIR::TypePathSegmentFunction &segment);
   virtual void visit (HIR::TypePath &path);
   virtual void visit (HIR::QualifiedPathInType &path);
diff --git a/gcc/rust/checks/errors/rust-const-checker.cc b/gcc/rust/checks/errors/rust-const-checker.cc
@@ -631,16 +631,6 @@ void
 ConstChecker::visit (EnumItemStruct &)
 {}
 
-void
-ConstChecker::visit (EnumItemDiscriminant &item)
-{
-  const_context.enter (item.get_mappings ().get_hirid ());
-
-  item.get_discriminant_expression ().accept_vis (*this);
-
-  const_context.exit ();
-}
-
 void
 ConstChecker::visit (Enum &enum_item)
 {
diff --git a/gcc/rust/checks/errors/rust-const-checker.h b/gcc/rust/checks/errors/rust-const-checker.h
@@ -150,7 +150,6 @@ class ConstChecker : public HIRFullVisitor
   virtual void visit (EnumItem &item) override;
   virtual void visit (EnumItemTuple &item) override;
   virtual void visit (EnumItemStruct &item) override;
-  virtual void visit (EnumItemDiscriminant &item) override;
   virtual void visit (Enum &enum_item) override;
   virtual void visit (Union &union_item) override;
   virtual void visit (ConstantItem &const_item) override;
diff --git a/gcc/rust/checks/errors/rust-hir-pattern-analysis.cc b/gcc/rust/checks/errors/rust-hir-pattern-analysis.cc
@@ -495,10 +495,6 @@ void
 PatternChecker::visit (EnumItemStruct &)
 {}
 
-void
-PatternChecker::visit (EnumItemDiscriminant &)
-{}
-
 void
 PatternChecker::visit (Enum &)
 {}
diff --git a/gcc/rust/checks/errors/rust-hir-pattern-analysis.h b/gcc/rust/checks/errors/rust-hir-pattern-analysis.h
@@ -123,7 +123,6 @@ class PatternChecker : public HIR::HIRFullVisitor
   virtual void visit (EnumItem &item) override;
   virtual void visit (EnumItemTuple &item) override;
   virtual void visit (EnumItemStruct &item) override;
-  virtual void visit (EnumItemDiscriminant &item) override;
   virtual void visit (Enum &enum_item) override;
   virtual void visit (Union &union_item) override;
   virtual void visit (ConstantItem &const_item) override;
diff --git a/gcc/rust/checks/errors/rust-unsafe-checker.cc b/gcc/rust/checks/errors/rust-unsafe-checker.cc
@@ -749,10 +749,6 @@ void
 UnsafeChecker::visit (EnumItemStruct &)
 {}
 
-void
-UnsafeChecker::visit (EnumItemDiscriminant &)
-{}
-
 void
 UnsafeChecker::visit (Enum &)
 {}
diff --git a/gcc/rust/checks/errors/rust-unsafe-checker.h b/gcc/rust/checks/errors/rust-unsafe-checker.h
@@ -131,7 +131,6 @@ class UnsafeChecker : public HIRFullVisitor
   virtual void visit (EnumItem &item) override;
   virtual void visit (EnumItemTuple &item) override;
   virtual void visit (EnumItemStruct &item) override;
-  virtual void visit (EnumItemDiscriminant &item) override;
   virtual void visit (Enum &enum_item) override;
   virtual void visit (Union &union_item) override;
   virtual void visit (ConstantItem &const_item) override;
diff --git a/gcc/rust/hir/rust-hir-dump.cc b/gcc/rust/hir/rust-hir-dump.cc
@@ -1814,18 +1814,6 @@ Dump::visit (EnumItemStruct &e)
   end ("EnumItemStruct");
 }
 
-void
-Dump::visit (EnumItemDiscriminant &e)
-{
-  begin ("EnumItemDiscriminant");
-
-  do_enumitem (e);
-
-  visit_field ("discriminant", e.get_discriminant_expression ());
-
-  end ("EnumItemDiscriminant");
-}
-
 void
 Dump::visit (Enum &e)
 {
diff --git a/gcc/rust/hir/rust-hir-dump.h b/gcc/rust/hir/rust-hir-dump.h
@@ -187,7 +187,6 @@ class Dump : public HIRFullVisitor
   virtual void visit (EnumItem &) override;
   virtual void visit (EnumItemTuple &) override;
   virtual void visit (EnumItemStruct &) override;
-  virtual void visit (EnumItemDiscriminant &) override;
 
   virtual void visit (Enum &) override;
   virtual void visit (Union &) override;
diff --git a/gcc/rust/hir/tree/rust-hir-full-decls.h b/gcc/rust/hir/tree/rust-hir-full-decls.h
@@ -161,7 +161,6 @@ class TupleStruct;
 class EnumItem;
 class EnumItemTuple;
 class EnumItemStruct;
-class EnumItemDiscriminant;
 class Enum;
 class Union;
 class ConstantItem;
diff --git a/gcc/rust/hir/tree/rust-hir-item.cc b/gcc/rust/hir/tree/rust-hir-item.cc
@@ -447,31 +447,6 @@ EnumItemStruct::EnumItemStruct (Analysis::NodeMapping mappings,
     struct_fields (std::move (struct_fields))
 {}
 
-EnumItemDiscriminant::EnumItemDiscriminant (Analysis::NodeMapping mappings,
-					    Identifier variant_name,
-					    std::unique_ptr<Expr> expr,
-					    AST::AttrVec outer_attrs,
-					    location_t locus)
-  : EnumItem (std::move (mappings), std::move (variant_name),
-	      std::move (outer_attrs), locus),
-    expression (std::move (expr))
-{}
-
-EnumItemDiscriminant::EnumItemDiscriminant (EnumItemDiscriminant const &other)
-  : EnumItem (other), expression (other.expression->clone_expr ())
-{}
-
-EnumItemDiscriminant &
-EnumItemDiscriminant::operator= (EnumItemDiscriminant const &other)
-{
-  EnumItem::operator= (other);
-  expression = other.expression->clone_expr ();
-  // variant_name = other.variant_name;
-  // outer_attrs = other.outer_attrs;
-
-  return *this;
-}
-
 Enum::Enum (Analysis::NodeMapping mappings, Identifier enum_name,
 	    Visibility vis,
 	    std::vector<std::unique_ptr<GenericParam>> generic_params,
diff --git a/gcc/rust/hir/tree/rust-hir-item.h b/gcc/rust/hir/tree/rust-hir-item.h
@@ -1571,51 +1571,6 @@ class EnumItemStruct : public EnumItem
   }
 };
 
-// A discriminant (numbered enum) item used in an "enum" tagged union
-class EnumItemDiscriminant : public EnumItem
-{
-  std::unique_ptr<Expr> expression;
-
-public:
-  EnumItemDiscriminant (Analysis::NodeMapping mappings, Identifier variant_name,
-			std::unique_ptr<Expr> expr, AST::AttrVec outer_attrs,
-			location_t locus);
-
-  // Copy constructor with clone
-  EnumItemDiscriminant (EnumItemDiscriminant const &other);
-
-  // Overloaded assignment operator to clone
-  EnumItemDiscriminant &operator= (EnumItemDiscriminant const &other);
-
-  // move constructors
-  EnumItemDiscriminant (EnumItemDiscriminant &&other) = default;
-  EnumItemDiscriminant &operator= (EnumItemDiscriminant &&other) = default;
-
-  EnumItemKind get_enum_item_kind () const override
-  {
-    return EnumItemKind::Discriminant;
-  }
-
-  std::string as_string () const override;
-
-  void accept_vis (HIRFullVisitor &vis) override;
-  void accept_vis (HIRStmtVisitor &vis) override;
-
-  Expr &get_discriminant_expression () { return *expression; }
-
-  std::unique_ptr<Expr> take_discriminant_expression ()
-  {
-    return std::move (expression);
-  }
-
-protected:
-  // Clone function implementation as (not pure) virtual method
-  EnumItemDiscriminant *clone_item_impl () const override
-  {
-    return new EnumItemDiscriminant (*this);
-  }
-};
-
 // HIR node for Rust "enum" - tagged union
 class Enum : public VisItem
 {
diff --git a/gcc/rust/hir/tree/rust-hir-visitor.h b/gcc/rust/hir/tree/rust-hir-visitor.h
@@ -101,7 +101,6 @@ class HIRFullVisitor
   virtual void visit (EnumItem &item) = 0;
   virtual void visit (EnumItemTuple &item) = 0;
   virtual void visit (EnumItemStruct &item) = 0;
-  virtual void visit (EnumItemDiscriminant &item) = 0;
   virtual void visit (Enum &enum_item) = 0;
   virtual void visit (Union &union_item) = 0;
   virtual void visit (ConstantItem &const_item) = 0;
@@ -240,7 +239,6 @@ class HIRFullVisitorBase : public HIRFullVisitor
   virtual void visit (EnumItem &) override {}
   virtual void visit (EnumItemTuple &) override {}
   virtual void visit (EnumItemStruct &) override {}
-  virtual void visit (EnumItemDiscriminant &) override {}
   virtual void visit (Enum &) override {}
   virtual void visit (Union &) override {}
   virtual void visit (ConstantItem &) override {}
@@ -369,7 +367,6 @@ class HIRStmtVisitor
   virtual void visit (EnumItemStruct &) = 0;
   virtual void visit (EnumItem &item) = 0;
   virtual void visit (TupleStruct &tuple_struct) = 0;
-  virtual void visit (EnumItemDiscriminant &) = 0;
   virtual void visit (TypePathSegmentFunction &segment) = 0;
   virtual void visit (TypePath &path) = 0;
   virtual void visit (QualifiedPathInType &path) = 0;
diff --git a/gcc/rust/hir/tree/rust-hir.cc b/gcc/rust/hir/tree/rust-hir.cc
@@ -3182,17 +3182,6 @@ StructField::as_string () const
   return str;
 }
 
-std::string
-EnumItemDiscriminant::as_string () const
-{
-  std::string str = EnumItem::as_string ();
-
-  // add equal and expression
-  str += " = " + expression->as_string ();
-
-  return str;
-}
-
 std::string
 ExternalItem::as_string () const
 {
@@ -4271,12 +4260,6 @@ EnumItemStruct::accept_vis (HIRFullVisitor &vis)
   vis.visit (*this);
 }
 
-void
-EnumItemDiscriminant::accept_vis (HIRFullVisitor &vis)
-{
-  vis.visit (*this);
-}
-
 void
 Enum::accept_vis (HIRFullVisitor &vis)
 {
@@ -4625,12 +4608,6 @@ ExternalStaticItem::accept_vis (HIRExternalItemVisitor &vis)
   vis.visit (*this);
 }
 
-void
-EnumItemDiscriminant::accept_vis (HIRStmtVisitor &vis)
-{
-  vis.visit (*this);
-}
-
 void
 EnumItemStruct::accept_vis (HIRStmtVisitor &vis)
 {
diff --git a/gcc/rust/typecheck/rust-hir-type-check-enumitem.cc b/gcc/rust/typecheck/rust-hir-type-check-enumitem.cc
@@ -47,9 +47,6 @@ TypeCheckEnumItem::Resolve (HIR::EnumItem &item, int64_t last_discriminant)
       resolver.visit (static_cast<HIR::EnumItemStruct &> (item));
       break;
 
-    case HIR::EnumItem::EnumItemKind::Discriminant:
-      resolver.visit (static_cast<HIR::EnumItemDiscriminant &> (item));
-      break;
     }
   return resolver.variant;
 }
@@ -104,51 +101,6 @@ TypeCheckEnumItem::visit (HIR::EnumItem &item)
 				  std::move (discim_expr));
 }
 
-void
-TypeCheckEnumItem::visit (HIR::EnumItemDiscriminant &item)
-{
-  if (last_discriminant == INT64_MAX)
-    rust_error_at (item.get_locus (), "discriminant too big");
-
-  auto &discriminant = item.get_discriminant_expression ();
-  auto capacity_type = TypeCheckExpr::Resolve (discriminant);
-  if (capacity_type->get_kind () == TyTy::TypeKind::ERROR)
-    return;
-
-  TyTy::ISizeType *expected_ty
-    = new TyTy::ISizeType (discriminant.get_mappings ().get_hirid ());
-  context->insert_type (discriminant.get_mappings (), expected_ty);
-
-  unify_site (item.get_mappings ().get_hirid (),
-	      TyTy::TyWithLocation (expected_ty),
-	      TyTy::TyWithLocation (capacity_type), item.get_locus ());
-
-  tl::optional<CanonicalPath> canonical_path;
-
-  if (flag_name_resolution_2_0)
-    {
-      auto &nr_ctx
-	= Resolver2_0::ImmutableNameResolutionContext::get ().resolver ();
-
-      canonical_path
-	= nr_ctx.types.to_canonical_path (item.get_mappings ().get_nodeid ());
-    }
-  else
-    {
-      canonical_path
-	= mappings.lookup_canonical_path (item.get_mappings ().get_nodeid ());
-    }
-
-  rust_assert (canonical_path.has_value ());
-
-  RustIdent ident{*canonical_path, item.get_locus ()};
-  variant
-    = new TyTy::VariantDef (item.get_mappings ().get_hirid (),
-			    item.get_mappings ().get_defid (),
-			    item.get_identifier ().as_string (), ident,
-			    item.get_discriminant_expression ().clone_expr ());
-}
-
 void
 TypeCheckEnumItem::visit (HIR::EnumItemTuple &item)
 {
diff --git a/gcc/rust/typecheck/rust-hir-type-check-enumitem.h b/gcc/rust/typecheck/rust-hir-type-check-enumitem.h
@@ -33,7 +33,6 @@ class TypeCheckEnumItem : public TypeCheckBase
 
 protected:
   void visit (HIR::EnumItem &item);
-  void visit (HIR::EnumItemDiscriminant &item);
   void visit (HIR::EnumItemTuple &item);
   void visit (HIR::EnumItemStruct &item);
 
diff --git a/gcc/rust/typecheck/rust-hir-type-check-stmt.h b/gcc/rust/typecheck/rust-hir-type-check-stmt.h
@@ -64,7 +64,6 @@ class TypeCheckStmt : private TypeCheckBase, private HIR::HIRStmtVisitor
   void visit (HIR::EnumItemTuple &) override {}
   void visit (HIR::EnumItemStruct &) override {}
   void visit (HIR::EnumItem &) override {}
-  void visit (HIR::EnumItemDiscriminant &) override {}
 
 private:
   TypeCheckStmt () : TypeCheckBase (), infered (nullptr) {}
