[gcc/devel/rust/master] Revert "hir: Add ExportedMacro node and handling."

Thomas Schwinge tschwinge@gcc.gnu.org
Thu Mar 30 06:46:06 GMT 2023 

https://gcc.gnu.org/g:7b14e6eecbb961a96cf94d9a0e67ffca7e4a3e8e

commit 7b14e6eecbb961a96cf94d9a0e67ffca7e4a3e8e
Author: Arthur Cohen <arthur.cohen@embecosm.com>
Date:   Wed Mar 15 17:15:39 2023 +0100

    Revert "hir: Add ExportedMacro node and handling."
    
    This reverts commit a1f940d193c6cdb13483690a4f4a7d501ad7040e. It is easier
    and cleaner to store exported macros' NodeIds into our mappings rather than
    create a new HIR kind of node.
    
    gcc/rust/ChangeLog:
    
            * backend/rust-compile-item.h: Revert 1c946687239b86a92839d57dfbc928ad7ce35eae.
            * backend/rust-compile-stmt.h: Likewise.
            * checks/errors/privacy/rust-privacy-reporter.cc
            (PrivacyReporter::visit): Likewise.
            * checks/errors/privacy/rust-privacy-reporter.h: Likewise.
            * checks/errors/privacy/rust-pub-restricted-visitor.cc
            (PubRestrictedVisitor::visit): Likewise.
            * checks/errors/privacy/rust-pub-restricted-visitor.h: Likewise.
            * checks/errors/privacy/rust-reachability.cc
            (ReachabilityVisitor::visit): Likewise.
            * checks/errors/privacy/rust-reachability.h: Likewise.
            * checks/errors/privacy/rust-visibility-resolver.cc
            (VisibilityResolver::visit): Likewise.
            * checks/errors/privacy/rust-visibility-resolver.h: Likewise.
            * checks/errors/rust-const-checker.cc (ConstChecker::visit): Likewise.
            * checks/errors/rust-const-checker.h: Likewise.
            * checks/errors/rust-unsafe-checker.cc (UnsafeChecker::visit): Likewise.
            * checks/errors/rust-unsafe-checker.h: Likewise.
            * hir/rust-ast-lower-item.cc (ASTLoweringItem::visit): Likewise.
            * hir/rust-ast-lower-item.h: Likewise.
            * hir/rust-hir-dump.cc (Dump::visit): Likewise.
            * hir/rust-hir-dump.h: Likewise.
            * hir/tree/rust-hir-full-decls.h (class ExportedMacro): Likewise.
            * hir/tree/rust-hir-item.h (class ExportedMacro): Likewise.
            * hir/tree/rust-hir-visitor.h: Likewise.
            * hir/tree/rust-hir.cc (ExportedMacro::accept_vis): Likewise.
            (ExportedMacro::get_locus): Likewise.
            (ExportedMacro::get_item_kind): Likewise.
            (ExportedMacro::clone_item_impl): Likewise.
            * hir/tree/rust-hir.h: Likewise.
            * metadata/rust-export-metadata.cc: Likewise.
            * typecheck/rust-hir-type-check-item.h: Likewise.
            * typecheck/rust-hir-type-check-stmt.cc (TypeCheckStmt::visit): Likewise.
            * typecheck/rust-hir-type-check-stmt.h: Likewise.
            * typecheck/rust-tycheck-dump.h: Likewise.
            * util/rust-attributes.cc: Likewise.

Diff:
---
 gcc/rust/backend/rust-compile-item.h               |  1 -
 gcc/rust/backend/rust-compile-stmt.h               |  1 -
 .../checks/errors/privacy/rust-privacy-reporter.cc |  4 ---
 .../checks/errors/privacy/rust-privacy-reporter.h  |  1 -
 .../errors/privacy/rust-pub-restricted-visitor.cc  |  7 -----
 .../errors/privacy/rust-pub-restricted-visitor.h   |  1 -
 .../checks/errors/privacy/rust-reachability.cc     |  4 ---
 gcc/rust/checks/errors/privacy/rust-reachability.h |  1 -
 .../errors/privacy/rust-visibility-resolver.cc     |  6 ----
 .../errors/privacy/rust-visibility-resolver.h      |  1 -
 gcc/rust/checks/errors/rust-const-checker.cc       |  4 ---
 gcc/rust/checks/errors/rust-const-checker.h        |  1 -
 gcc/rust/checks/errors/rust-unsafe-checker.cc      |  4 ---
 gcc/rust/checks/errors/rust-unsafe-checker.h       |  1 -
 gcc/rust/hir/rust-ast-lower-item.cc                | 22 -------------
 gcc/rust/hir/rust-ast-lower-item.h                 |  1 -
 gcc/rust/hir/rust-hir-dump.cc                      |  3 --
 gcc/rust/hir/rust-hir-dump.h                       |  1 -
 gcc/rust/hir/tree/rust-hir-full-decls.h            |  3 --
 gcc/rust/hir/tree/rust-hir-item.h                  | 21 -------------
 gcc/rust/hir/tree/rust-hir-visitor.h               |  4 ---
 gcc/rust/hir/tree/rust-hir.cc                      | 36 ----------------------
 gcc/rust/hir/tree/rust-hir.h                       |  1 -
 gcc/rust/metadata/rust-export-metadata.cc          |  1 -
 gcc/rust/typecheck/rust-hir-type-check-item.h      |  1 -
 gcc/rust/typecheck/rust-hir-type-check-stmt.cc     |  4 ---
 gcc/rust/typecheck/rust-hir-type-check-stmt.h      |  1 -
 gcc/rust/typecheck/rust-tycheck-dump.h             |  2 --
 gcc/rust/util/rust-attributes.cc                   |  1 -
 29 files changed, 139 deletions(-)

diff --git a/gcc/rust/backend/rust-compile-item.h b/gcc/rust/backend/rust-compile-item.h
index 333e55490ce..ae3fdf6647e 100644
--- a/gcc/rust/backend/rust-compile-item.h
+++ b/gcc/rust/backend/rust-compile-item.h
@@ -70,7 +70,6 @@ public:
   void visit (HIR::LetStmt &) override {}
   void visit (HIR::ExprStmtWithoutBlock &) override {}
   void visit (HIR::ExprStmtWithBlock &) override {}
-  void visit (HIR::ExportedMacro &) override {}
 
 protected:
   CompileItem (Context *ctx, TyTy::BaseType *concrete, Location ref_locus)
diff --git a/gcc/rust/backend/rust-compile-stmt.h b/gcc/rust/backend/rust-compile-stmt.h
index 3d2f3ddb746..1f06d54f498 100644
--- a/gcc/rust/backend/rust-compile-stmt.h
+++ b/gcc/rust/backend/rust-compile-stmt.h
@@ -56,7 +56,6 @@ public:
   void visit (HIR::ImplBlock &) override {}
   void visit (HIR::ExternBlock &) override {}
   void visit (HIR::EmptyStmt &) override {}
-  void visit (HIR::ExportedMacro &) override {}
 
 private:
   CompileStmt (Context *ctx);
diff --git a/gcc/rust/checks/errors/privacy/rust-privacy-reporter.cc b/gcc/rust/checks/errors/privacy/rust-privacy-reporter.cc
index 52af05c8c23..ea2ad9fb00e 100644
--- a/gcc/rust/checks/errors/privacy/rust-privacy-reporter.cc
+++ b/gcc/rust/checks/errors/privacy/rust-privacy-reporter.cc
@@ -728,9 +728,5 @@ PrivacyReporter::visit (HIR::ExprStmtWithBlock &stmt)
   stmt.get_expr ()->accept_vis (*this);
 }
 
-void
-PrivacyReporter::visit (HIR::ExportedMacro &)
-{}
-
 } // namespace Privacy
 } // namespace Rust
diff --git a/gcc/rust/checks/errors/privacy/rust-privacy-reporter.h b/gcc/rust/checks/errors/privacy/rust-privacy-reporter.h
index 61b581993ce..c19d3fa059b 100644
--- a/gcc/rust/checks/errors/privacy/rust-privacy-reporter.h
+++ b/gcc/rust/checks/errors/privacy/rust-privacy-reporter.h
@@ -153,7 +153,6 @@ types
   virtual void visit (HIR::LetStmt &stmt);
   virtual void visit (HIR::ExprStmtWithoutBlock &stmt);
   virtual void visit (HIR::ExprStmtWithBlock &stmt);
-  virtual void visit (HIR::ExportedMacro &macro);
 
   Analysis::Mappings &mappings;
   Rust::Resolver::Resolver &resolver;
diff --git a/gcc/rust/checks/errors/privacy/rust-pub-restricted-visitor.cc b/gcc/rust/checks/errors/privacy/rust-pub-restricted-visitor.cc
index 4dbd44ebb92..851fc7cd6ac 100644
--- a/gcc/rust/checks/errors/privacy/rust-pub-restricted-visitor.cc
+++ b/gcc/rust/checks/errors/privacy/rust-pub-restricted-visitor.cc
@@ -178,12 +178,5 @@ PubRestrictedVisitor::visit (HIR::ExternBlock &block)
 			block.get_locus ());
 }
 
-void
-PubRestrictedVisitor::visit (HIR::ExportedMacro &macro)
-{
-  is_restriction_valid (macro.get_mappings ().get_nodeid (),
-			macro.get_locus ());
-}
-
 } // namespace Privacy
 } // namespace Rust
diff --git a/gcc/rust/checks/errors/privacy/rust-pub-restricted-visitor.h b/gcc/rust/checks/errors/privacy/rust-pub-restricted-visitor.h
index d8419e2921b..c77c6d86903 100644
--- a/gcc/rust/checks/errors/privacy/rust-pub-restricted-visitor.h
+++ b/gcc/rust/checks/errors/privacy/rust-pub-restricted-visitor.h
@@ -103,7 +103,6 @@ public:
   virtual void visit (HIR::Trait &trait);
   virtual void visit (HIR::ImplBlock &impl);
   virtual void visit (HIR::ExternBlock &block);
-  virtual void visit (HIR::ExportedMacro &macro);
 
 private:
   /* Stack of ancestor modules visited by this visitor */
diff --git a/gcc/rust/checks/errors/privacy/rust-reachability.cc b/gcc/rust/checks/errors/privacy/rust-reachability.cc
index d75e2a1f49a..b9a2b363708 100644
--- a/gcc/rust/checks/errors/privacy/rust-reachability.cc
+++ b/gcc/rust/checks/errors/privacy/rust-reachability.cc
@@ -230,10 +230,6 @@ void
 ReachabilityVisitor::visit (HIR::ExternBlock &)
 {}
 
-void
-ReachabilityVisitor::visit (HIR::ExportedMacro &macro)
-{}
-
 // FIXME: How can we visit Blocks in the current configuration? Have a full
 // visitor?
 } // namespace Privacy
diff --git a/gcc/rust/checks/errors/privacy/rust-reachability.h b/gcc/rust/checks/errors/privacy/rust-reachability.h
index 80fb1d4899c..bfc44eb8af9 100644
--- a/gcc/rust/checks/errors/privacy/rust-reachability.h
+++ b/gcc/rust/checks/errors/privacy/rust-reachability.h
@@ -75,7 +75,6 @@ public:
   virtual void visit (HIR::Trait &trait);
   virtual void visit (HIR::ImplBlock &impl);
   virtual void visit (HIR::ExternBlock &block);
-  virtual void visit (HIR::ExportedMacro &macro);
 
 private:
   ReachLevel current_level;
diff --git a/gcc/rust/checks/errors/privacy/rust-visibility-resolver.cc b/gcc/rust/checks/errors/privacy/rust-visibility-resolver.cc
index 72a3a5f8829..30afaf9174e 100644
--- a/gcc/rust/checks/errors/privacy/rust-visibility-resolver.cc
+++ b/gcc/rust/checks/errors/privacy/rust-visibility-resolver.cc
@@ -241,11 +241,5 @@ void
 VisibilityResolver::visit (HIR::ExternBlock &)
 {}
 
-void
-VisibilityResolver::visit (HIR::ExportedMacro &macro)
-{
-  resolve_and_update (&macro);
-}
-
 } // namespace Privacy
 } // namespace Rust
diff --git a/gcc/rust/checks/errors/privacy/rust-visibility-resolver.h b/gcc/rust/checks/errors/privacy/rust-visibility-resolver.h
index 9ea8ebd5c4f..1c453d1b11c 100644
--- a/gcc/rust/checks/errors/privacy/rust-visibility-resolver.h
+++ b/gcc/rust/checks/errors/privacy/rust-visibility-resolver.h
@@ -90,7 +90,6 @@ public:
   virtual void visit (HIR::Trait &trait);
   virtual void visit (HIR::ImplBlock &impl);
   virtual void visit (HIR::ExternBlock &block);
-  virtual void visit (HIR::ExportedMacro &macro);
 
 private:
   Analysis::Mappings &mappings;
diff --git a/gcc/rust/checks/errors/rust-const-checker.cc b/gcc/rust/checks/errors/rust-const-checker.cc
index 23b90c9e83f..131dc662ef4 100644
--- a/gcc/rust/checks/errors/rust-const-checker.cc
+++ b/gcc/rust/checks/errors/rust-const-checker.cc
@@ -894,9 +894,5 @@ void
 ConstChecker::visit (BareFunctionType &)
 {}
 
-void
-ConstChecker::visit (ExportedMacro &)
-{}
-
 } // namespace HIR
 } // namespace Rust
diff --git a/gcc/rust/checks/errors/rust-const-checker.h b/gcc/rust/checks/errors/rust-const-checker.h
index e3b096583b5..15c6158f397 100644
--- a/gcc/rust/checks/errors/rust-const-checker.h
+++ b/gcc/rust/checks/errors/rust-const-checker.h
@@ -201,7 +201,6 @@ private:
   virtual void visit (SliceType &type) override;
   virtual void visit (InferredType &type) override;
   virtual void visit (BareFunctionType &type) override;
-  virtual void visit (ExportedMacro &macro) override;
 };
 
 } // namespace HIR
diff --git a/gcc/rust/checks/errors/rust-unsafe-checker.cc b/gcc/rust/checks/errors/rust-unsafe-checker.cc
index 5293cbe0d11..cdf62338a4d 100644
--- a/gcc/rust/checks/errors/rust-unsafe-checker.cc
+++ b/gcc/rust/checks/errors/rust-unsafe-checker.cc
@@ -951,9 +951,5 @@ void
 UnsafeChecker::visit (BareFunctionType &)
 {}
 
-void
-UnsafeChecker::visit (ExportedMacro &)
-{}
-
 } // namespace HIR
 } // namespace Rust
diff --git a/gcc/rust/checks/errors/rust-unsafe-checker.h b/gcc/rust/checks/errors/rust-unsafe-checker.h
index 7eab61ca4f0..a55c6db68d1 100644
--- a/gcc/rust/checks/errors/rust-unsafe-checker.h
+++ b/gcc/rust/checks/errors/rust-unsafe-checker.h
@@ -183,7 +183,6 @@ private:
   virtual void visit (SliceType &type) override;
   virtual void visit (InferredType &type) override;
   virtual void visit (BareFunctionType &type) override;
-  virtual void visit (ExportedMacro &macro) override;
 };
 
 } // namespace HIR
diff --git a/gcc/rust/hir/rust-ast-lower-item.cc b/gcc/rust/hir/rust-ast-lower-item.cc
index eade1bcf695..a166b91483e 100644
--- a/gcc/rust/hir/rust-ast-lower-item.cc
+++ b/gcc/rust/hir/rust-ast-lower-item.cc
@@ -705,28 +705,6 @@ ASTLoweringItem::visit (AST::ExternBlock &extern_block)
   translated = lower_extern_block (extern_block);
 }
 
-void
-ASTLoweringItem::visit (AST::MacroRulesDefinition &def)
-{
-  bool is_export = false;
-  for (const auto &attr : def.get_outer_attrs ())
-    if (attr.get_path ().as_string () == "macro_export")
-      is_export = true;
-
-  if (is_export)
-    {
-      auto crate_num = mappings->get_current_crate ();
-      Analysis::NodeMapping mapping (crate_num, def.get_node_id (),
-				     mappings->get_next_hir_id (crate_num),
-				     mappings->get_next_localdef_id (
-				       crate_num));
-      auto locus = def.get_locus ();
-
-      translated
-	= new HIR::ExportedMacro (mapping, def.get_outer_attrs (), locus);
-    }
-}
-
 HIR::SimplePath
 ASTLoweringSimplePath::translate (const AST::SimplePath &path)
 {
diff --git a/gcc/rust/hir/rust-ast-lower-item.h b/gcc/rust/hir/rust-ast-lower-item.h
index 15619c003f8..3680ed433d3 100644
--- a/gcc/rust/hir/rust-ast-lower-item.h
+++ b/gcc/rust/hir/rust-ast-lower-item.h
@@ -44,7 +44,6 @@ public:
   void visit (AST::Trait &trait) override;
   void visit (AST::TraitImpl &impl_block) override;
   void visit (AST::ExternBlock &extern_block) override;
-  void visit (AST::MacroRulesDefinition &macro) override;
 
 private:
   ASTLoweringItem () : translated (nullptr) {}
diff --git a/gcc/rust/hir/rust-hir-dump.cc b/gcc/rust/hir/rust-hir-dump.cc
index 1585df5506b..bc4ff53c01d 100644
--- a/gcc/rust/hir/rust-hir-dump.cc
+++ b/gcc/rust/hir/rust-hir-dump.cc
@@ -697,8 +697,5 @@ Dump::visit (InferredType &)
 void
 Dump::visit (BareFunctionType &)
 {}
-void
-Dump::visit (ExportedMacro &)
-{}
 } // namespace HIR
 } // namespace Rust
diff --git a/gcc/rust/hir/rust-hir-dump.h b/gcc/rust/hir/rust-hir-dump.h
index d0256340d4d..7b8b54d501d 100644
--- a/gcc/rust/hir/rust-hir-dump.h
+++ b/gcc/rust/hir/rust-hir-dump.h
@@ -181,7 +181,6 @@ private:
   virtual void visit (SliceType &) override;
   virtual void visit (InferredType &) override;
   virtual void visit (BareFunctionType &) override;
-  virtual void visit (ExportedMacro &) override;
 };
 
 } // namespace HIR
diff --git a/gcc/rust/hir/tree/rust-hir-full-decls.h b/gcc/rust/hir/tree/rust-hir-full-decls.h
index 76117ebef68..46abe430f38 100644
--- a/gcc/rust/hir/tree/rust-hir-full-decls.h
+++ b/gcc/rust/hir/tree/rust-hir-full-decls.h
@@ -35,9 +35,6 @@ class Lifetime;
 class GenericParam;
 class LifetimeParam;
 
-// FIXME: ARTHUR: Move this somewhere else
-class ExportedMacro;
-
 class TraitItem;
 class ImplItem;
 struct Crate;
diff --git a/gcc/rust/hir/tree/rust-hir-item.h b/gcc/rust/hir/tree/rust-hir-item.h
index 9ff9732cda8..774f0245713 100644
--- a/gcc/rust/hir/tree/rust-hir-item.h
+++ b/gcc/rust/hir/tree/rust-hir-item.h
@@ -3226,27 +3226,6 @@ protected:
   }*/
 };
 
-class ExportedMacro : public VisItem
-{
-  Location locus;
-
-public:
-  ExportedMacro (Analysis::NodeMapping mapping, AST::AttrVec outer_attrs,
-		 Location locus)
-    : VisItem (mapping, Visibility (Visibility::PUBLIC),
-	       std::move (outer_attrs)),
-      locus (locus)
-  {}
-
-  virtual Location get_locus () const override;
-  virtual ItemKind get_item_kind () const override;
-  virtual ExportedMacro *clone_item_impl () const override;
-
-  void accept_vis (HIRFullVisitor &vis) override;
-  void accept_vis (HIRStmtVisitor &vis) override;
-  void accept_vis (HIRVisItemVisitor &vis) override;
-};
-
 } // namespace HIR
 } // namespace Rust
 
diff --git a/gcc/rust/hir/tree/rust-hir-visitor.h b/gcc/rust/hir/tree/rust-hir-visitor.h
index 63db0d79d00..17c9c6d895b 100644
--- a/gcc/rust/hir/tree/rust-hir-visitor.h
+++ b/gcc/rust/hir/tree/rust-hir-visitor.h
@@ -153,7 +153,6 @@ public:
   virtual void visit (SliceType &type) = 0;
   virtual void visit (InferredType &type) = 0;
   virtual void visit (BareFunctionType &type) = 0;
-  virtual void visit (ExportedMacro &macro) = 0;
 };
 
 class HIRFullVisitorBase : public HIRFullVisitor
@@ -304,7 +303,6 @@ public:
   virtual void visit (SliceType &) override {}
   virtual void visit (InferredType &) override {}
   virtual void visit (BareFunctionType &) override {}
-  virtual void visit (ExportedMacro &) override {}
 };
 
 class HIRExternalItemVisitor
@@ -339,7 +337,6 @@ public:
   virtual void visit (Trait &trait) = 0;
   virtual void visit (ImplBlock &impl) = 0;
   virtual void visit (ExternBlock &block) = 0;
-  virtual void visit (ExportedMacro &macro) = 0;
 };
 
 class HIRImplVisitor
@@ -399,7 +396,6 @@ public:
   virtual void visit (LetStmt &stmt) = 0;
   virtual void visit (ExprStmtWithoutBlock &stmt) = 0;
   virtual void visit (ExprStmtWithBlock &stmt) = 0;
-  virtual void visit (ExportedMacro &macro) = 0;
 };
 
 class HIRExpressionVisitor
diff --git a/gcc/rust/hir/tree/rust-hir.cc b/gcc/rust/hir/tree/rust-hir.cc
index 92e002cad31..a6a1736132f 100644
--- a/gcc/rust/hir/tree/rust-hir.cc
+++ b/gcc/rust/hir/tree/rust-hir.cc
@@ -5180,41 +5180,5 @@ void
 ConstGenericParam::accept_vis (HIRFullVisitor &)
 {}
 
-void
-ExportedMacro::accept_vis (HIRVisItemVisitor &vis)
-{
-  vis.visit (*this);
-}
-
-void
-ExportedMacro::accept_vis (HIRFullVisitor &vis)
-{
-  vis.visit (*this);
-}
-
-void
-ExportedMacro::accept_vis (HIRStmtVisitor &vis)
-{
-  vis.visit (*this);
-}
-
-Location
-ExportedMacro::get_locus () const
-{
-  return locus;
-}
-
-Item::ItemKind
-ExportedMacro::get_item_kind () const
-{
-  return ItemKind::MacroExport;
-}
-
-ExportedMacro *
-ExportedMacro::clone_item_impl () const
-{
-  return new ExportedMacro (*this);
-}
-
 } // namespace HIR
 } // namespace Rust
diff --git a/gcc/rust/hir/tree/rust-hir.h b/gcc/rust/hir/tree/rust-hir.h
index 6d5b755029f..6ed74428356 100644
--- a/gcc/rust/hir/tree/rust-hir.h
+++ b/gcc/rust/hir/tree/rust-hir.h
@@ -191,7 +191,6 @@ public:
     Trait,
     Impl,
     Module,
-    MacroExport,
   };
 
   virtual ItemKind get_item_kind () const = 0;
diff --git a/gcc/rust/metadata/rust-export-metadata.cc b/gcc/rust/metadata/rust-export-metadata.cc
index dc6e559ce1e..49a7226476d 100644
--- a/gcc/rust/metadata/rust-export-metadata.cc
+++ b/gcc/rust/metadata/rust-export-metadata.cc
@@ -169,7 +169,6 @@ public:
   void visit (HIR::StaticItem &) override {}
   void visit (HIR::ImplBlock &) override {}
   void visit (HIR::ExternBlock &) override {}
-  void visit (HIR::ExportedMacro &) override {}
 
   void visit (HIR::Trait &trait) override { ctx.emit_trait (trait); }
 
diff --git a/gcc/rust/typecheck/rust-hir-type-check-item.h b/gcc/rust/typecheck/rust-hir-type-check-item.h
index 437a3d377e4..2268fdb6e6c 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-item.h
+++ b/gcc/rust/typecheck/rust-hir-type-check-item.h
@@ -50,7 +50,6 @@ public:
   // nothing to do
   void visit (HIR::ExternCrate &) override {}
   void visit (HIR::UseDeclaration &) override {}
-  void visit (HIR::ExportedMacro &) override {}
 
 protected:
   std::vector<TyTy::SubstitutionParamMapping>
diff --git a/gcc/rust/typecheck/rust-hir-type-check-stmt.cc b/gcc/rust/typecheck/rust-hir-type-check-stmt.cc
index 3456b954bd4..96ab3b1fd2f 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-stmt.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-stmt.cc
@@ -147,10 +147,6 @@ TypeCheckStmt::visit (HIR::QualifiedPathInType &path)
   infered = TypeCheckType::Resolve (&path);
 }
 
-void
-TypeCheckStmt::visit (HIR::ExportedMacro &path)
-{}
-
 void
 TypeCheckStmt::visit (HIR::TupleStruct &struct_decl)
 {
diff --git a/gcc/rust/typecheck/rust-hir-type-check-stmt.h b/gcc/rust/typecheck/rust-hir-type-check-stmt.h
index 7331b2a92fc..04878b8c531 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-stmt.h
+++ b/gcc/rust/typecheck/rust-hir-type-check-stmt.h
@@ -47,7 +47,6 @@ public:
   void visit (HIR::ImplBlock &impl) override;
   void visit (HIR::TypePath &path) override;
   void visit (HIR::QualifiedPathInType &path) override;
-  void visit (HIR::ExportedMacro &path) override;
 
   // FIXME
   // this seems like it should not be part of this visitor
diff --git a/gcc/rust/typecheck/rust-tycheck-dump.h b/gcc/rust/typecheck/rust-tycheck-dump.h
index 19a52dd0022..0076fe9e3b7 100644
--- a/gcc/rust/typecheck/rust-tycheck-dump.h
+++ b/gcc/rust/typecheck/rust-tycheck-dump.h
@@ -196,8 +196,6 @@ public:
     dump += "ctor: " + type_string (expr.get_mappings ());
   }
 
-  void visit (HIR::ExportedMacro &) override {}
-
 protected:
   std::string type_string (const Analysis::NodeMapping &mappings)
   {
diff --git a/gcc/rust/util/rust-attributes.cc b/gcc/rust/util/rust-attributes.cc
index 2573ec9b10f..6df00ad95be 100644
--- a/gcc/rust/util/rust-attributes.cc
+++ b/gcc/rust/util/rust-attributes.cc
@@ -41,7 +41,6 @@ static const BuiltinAttrDefinition __definitions[]
      {"repr", CODE_GENERATION},
      {"path", EXPANSION},
      {"macro_use", NAME_RESOLUTION},
-     {"macro_export", CODE_GENERATION}, // FIXME: And NAME_RESOLUTION as well
      // FIXME: This is not implemented yet, see
      // https://github.com/Rust-GCC/gccrs/issues/1475
      {"target_feature", CODE_GENERATION},

More information about the Gcc-cvs mailing list