diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-08-21 20:47:52 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-21 20:47:52 +0000 |
commit | e9746f445cf57c12f70d0016722835ec504cc655 (patch) | |
tree | 8d5ef1eec38edc2ea93d29d8199758ce97be2d7c /gcc/rust/backend | |
parent | 79754bd20bdfa64a4ce91e5b4a65154c313b2d83 (diff) | |
parent | abaec437780d818d6ecfb265f215a2b9b4a3035b (diff) | |
download | gcc-e9746f445cf57c12f70d0016722835ec504cc655.zip gcc-e9746f445cf57c12f70d0016722835ec504cc655.tar.gz gcc-e9746f445cf57c12f70d0016722835ec504cc655.tar.bz2 |
Merge #638
638: hir: Merge both module classes in one r=philberty a=CohenArthur
At this point in the pipeline, all modules are either internal and
contain items, or external and have been previously expanded in the
macro-expand phase. Thus, all HIR modules will contain their final set
of items
Co-authored-by: CohenArthur <arthur.cohen@epita.fr>
Diffstat (limited to 'gcc/rust/backend')
-rw-r--r-- | gcc/rust/backend/rust-compile-base.h | 3 | ||||
-rw-r--r-- | gcc/rust/backend/rust-compile-item.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/gcc/rust/backend/rust-compile-base.h b/gcc/rust/backend/rust-compile-base.h index 6a05c1c..3daad5f 100644 --- a/gcc/rust/backend/rust-compile-base.h +++ b/gcc/rust/backend/rust-compile-base.h @@ -121,8 +121,7 @@ public: // virtual void visit(WhereClauseItem& item) {} virtual void visit (HIR::LifetimeWhereClauseItem &item) {} virtual void visit (HIR::TypeBoundWhereClauseItem &item) {} - virtual void visit (HIR::ModuleBodied &module) {} - virtual void visit (HIR::ModuleNoBody &module) {} + virtual void visit (HIR::Module &module) {} virtual void visit (HIR::ExternCrate &crate) {} // virtual void visit(UseTree& use_tree) {} virtual void visit (HIR::UseTreeGlob &use_tree) {} diff --git a/gcc/rust/backend/rust-compile-item.h b/gcc/rust/backend/rust-compile-item.h index a12e67e..af0bc43 100644 --- a/gcc/rust/backend/rust-compile-item.h +++ b/gcc/rust/backend/rust-compile-item.h @@ -313,7 +313,7 @@ public: } } - void visit (HIR::ModuleBodied &module) override + void visit (HIR::Module &module) override { for (auto &item : module.get_items ()) CompileItem::compile (item.get (), ctx, compile_fns); |