From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 4F0FB381D4AD; Wed, 8 Jun 2022 12:46:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4F0FB381D4AD Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] mappings: Store NodeIds for visibility_map X-Act-Checkin: gcc X-Git-Author: Arthur Cohen X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 56b4aa48df965191558e58dede5631e10faab2d5 X-Git-Newrev: 172624a7f9ce1ba16a89c7ee64861cb5447b7561 Message-Id: <20220608124641.4F0FB381D4AD@sourceware.org> Date: Wed, 8 Jun 2022 12:46:41 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jun 2022 12:46:41 -0000 https://gcc.gnu.org/g:172624a7f9ce1ba16a89c7ee64861cb5447b7561 commit 172624a7f9ce1ba16a89c7ee64861cb5447b7561 Author: Arthur Cohen Date: Thu May 12 15:21:39 2022 +0200 mappings: Store NodeIds for visibility_map Diff: --- gcc/rust/privacy/rust-privacy-common.h | 5 ++++ gcc/rust/privacy/rust-pub-restricted-visitor.cc | 35 ++++++++++++++----------- gcc/rust/privacy/rust-pub-restricted-visitor.h | 4 +-- gcc/rust/privacy/rust-visibility-resolver.cc | 25 ++++++++++-------- gcc/rust/util/rust-hir-map.cc | 6 ++--- gcc/rust/util/rust-hir-map.h | 6 ++--- 6 files changed, 46 insertions(+), 35 deletions(-) diff --git a/gcc/rust/privacy/rust-privacy-common.h b/gcc/rust/privacy/rust-privacy-common.h index a47992f778c..764e31ae5d4 100644 --- a/gcc/rust/privacy/rust-privacy-common.h +++ b/gcc/rust/privacy/rust-privacy-common.h @@ -48,6 +48,11 @@ public: return ModuleVisibility (Type::Public, UNKNOWN_DEFID); } + static ModuleVisibility create_private () + { + return ModuleVisibility (Type::Private, UNKNOWN_DEFID); + } + Type get_kind () const { return kind; } const DefId &get_module_id () const { return module_id; } diff --git a/gcc/rust/privacy/rust-pub-restricted-visitor.cc b/gcc/rust/privacy/rust-pub-restricted-visitor.cc index ca50fe31e6c..09bddf0c169 100644 --- a/gcc/rust/privacy/rust-pub-restricted-visitor.cc +++ b/gcc/rust/privacy/rust-pub-restricted-visitor.cc @@ -24,14 +24,14 @@ namespace Rust { namespace Privacy { bool -PubRestrictedVisitor::is_restriction_valid (DefId item_id, +PubRestrictedVisitor::is_restriction_valid (NodeId item_id, const Location &locus) { ModuleVisibility visibility; // If there is no visibility in the mappings, then the item is private and // does not contain any restriction - if (!mappings.lookup_visibility (item_id, &visibility)) + if (!mappings.lookup_visibility (item_id, visibility)) return true; for (auto mod = module_stack.rbegin (); mod != module_stack.rend (); mod++) @@ -72,7 +72,7 @@ PubRestrictedVisitor::visit (HIR::Module &mod) // FIXME: We need to update `super` and `self` here module_stack.push_back (mod.get_mappings ().get_defid ()); - is_restriction_valid (mod.get_mappings ().get_defid (), mod.get_locus ()); + is_restriction_valid (mod.get_mappings ().get_nodeid (), mod.get_locus ()); for (auto &item : mod.get_items ()) { @@ -89,33 +89,34 @@ PubRestrictedVisitor::visit (HIR::Module &mod) void PubRestrictedVisitor::visit (HIR::ExternCrate &crate) { - is_restriction_valid (crate.get_mappings ().get_defid (), crate.get_locus ()); + is_restriction_valid (crate.get_mappings ().get_nodeid (), + crate.get_locus ()); } void PubRestrictedVisitor::visit (HIR::UseDeclaration &use_decl) { - is_restriction_valid (use_decl.get_mappings ().get_defid (), + is_restriction_valid (use_decl.get_mappings ().get_nodeid (), use_decl.get_locus ()); } void PubRestrictedVisitor::visit (HIR::Function &func) { - is_restriction_valid (func.get_mappings ().get_defid (), func.get_locus ()); + is_restriction_valid (func.get_mappings ().get_nodeid (), func.get_locus ()); } void PubRestrictedVisitor::visit (HIR::TypeAlias &type_alias) { - is_restriction_valid (type_alias.get_mappings ().get_defid (), + is_restriction_valid (type_alias.get_mappings ().get_nodeid (), type_alias.get_locus ()); } void PubRestrictedVisitor::visit (HIR::StructStruct &struct_item) { - is_restriction_valid (struct_item.get_mappings ().get_defid (), + is_restriction_valid (struct_item.get_mappings ().get_nodeid (), struct_item.get_locus ()); // FIXME: Check fields here as well } @@ -123,7 +124,7 @@ PubRestrictedVisitor::visit (HIR::StructStruct &struct_item) void PubRestrictedVisitor::visit (HIR::TupleStruct &tuple_struct) { - is_restriction_valid (tuple_struct.get_mappings ().get_defid (), + is_restriction_valid (tuple_struct.get_mappings ().get_nodeid (), tuple_struct.get_locus ()); // FIXME: Check fields here as well } @@ -131,47 +132,49 @@ PubRestrictedVisitor::visit (HIR::TupleStruct &tuple_struct) void PubRestrictedVisitor::visit (HIR::Enum &enum_item) { - is_restriction_valid (enum_item.get_mappings ().get_defid (), + is_restriction_valid (enum_item.get_mappings ().get_nodeid (), enum_item.get_locus ()); } void PubRestrictedVisitor::visit (HIR::Union &union_item) { - is_restriction_valid (union_item.get_mappings ().get_defid (), + is_restriction_valid (union_item.get_mappings ().get_nodeid (), union_item.get_locus ()); } void PubRestrictedVisitor::visit (HIR::ConstantItem &const_item) { - is_restriction_valid (const_item.get_mappings ().get_defid (), + is_restriction_valid (const_item.get_mappings ().get_nodeid (), const_item.get_locus ()); } void PubRestrictedVisitor::visit (HIR::StaticItem &static_item) { - is_restriction_valid (static_item.get_mappings ().get_defid (), + is_restriction_valid (static_item.get_mappings ().get_nodeid (), static_item.get_locus ()); } void PubRestrictedVisitor::visit (HIR::Trait &trait) { - is_restriction_valid (trait.get_mappings ().get_defid (), trait.get_locus ()); + is_restriction_valid (trait.get_mappings ().get_nodeid (), + trait.get_locus ()); } void PubRestrictedVisitor::visit (HIR::ImplBlock &impl) { - is_restriction_valid (impl.get_mappings ().get_defid (), impl.get_locus ()); + is_restriction_valid (impl.get_mappings ().get_nodeid (), impl.get_locus ()); } void PubRestrictedVisitor::visit (HIR::ExternBlock &block) { - is_restriction_valid (block.get_mappings ().get_defid (), block.get_locus ()); + is_restriction_valid (block.get_mappings ().get_nodeid (), + block.get_locus ()); } } // namespace Privacy diff --git a/gcc/rust/privacy/rust-pub-restricted-visitor.h b/gcc/rust/privacy/rust-pub-restricted-visitor.h index dc725e1f7ee..2685f3d1488 100644 --- a/gcc/rust/privacy/rust-pub-restricted-visitor.h +++ b/gcc/rust/privacy/rust-pub-restricted-visitor.h @@ -82,12 +82,12 @@ public: * * In case of error, this function will emit the errors and return. * - * @param item_id DefId of the item to check the restriction of + * @param item_id NodeId of the item to check the restriction of * @param locus Location of the item being checked * * @return true if the visibility restriction is valid, false otherwise. */ - bool is_restriction_valid (DefId item_id, const Location &locus); + bool is_restriction_valid (NodeId item_id, const Location &locus); virtual void visit (HIR::Module &mod); virtual void visit (HIR::ExternCrate &crate); diff --git a/gcc/rust/privacy/rust-visibility-resolver.cc b/gcc/rust/privacy/rust-visibility-resolver.cc index 38d640340e8..a02740be3e8 100644 --- a/gcc/rust/privacy/rust-visibility-resolver.cc +++ b/gcc/rust/privacy/rust-visibility-resolver.cc @@ -32,7 +32,7 @@ VisibilityResolver::VisibilityResolver (Analysis::Mappings &mappings, void VisibilityResolver::go (HIR::Crate &crate) { - mappings.insert_visibility (crate.get_mappings ().get_defid (), + mappings.insert_visibility (crate.get_mappings ().get_nodeid (), ModuleVisibility::create_public ()); for (auto &item : crate.items) @@ -103,15 +103,18 @@ VisibilityResolver::resolve_visibility (const HIR::Visibility &visibility, switch (visibility.get_vis_type ()) { case HIR::Visibility::PRIVATE: + to_resolve = ModuleVisibility::create_private (); return true; case HIR::Visibility::PUBLIC: to_resolve = ModuleVisibility::create_public (); return true; - case HIR::Visibility::RESTRICTED: - // FIXME: We also need to handle 2015 vs 2018 edition conflicts - to_resolve = ModuleVisibility::create_public (); - return resolve_module_path (visibility.get_path (), - to_resolve.get_module_id ()); + case HIR::Visibility::RESTRICTED: { + // FIXME: We also need to handle 2015 vs 2018 edition conflicts + auto id = UNKNOWN_DEFID; + auto result = resolve_module_path (visibility.get_path (), id); + to_resolve = ModuleVisibility::create_restricted (id); + return result; + } default: gcc_unreachable (); return false; @@ -125,7 +128,7 @@ VisibilityResolver::resolve_and_update (const HIR::VisItem *item) if (!resolve_visibility (item->get_visibility (), module_vis)) return; // we will already have emitted errors - mappings.insert_visibility (item->get_mappings ().get_defid (), module_vis); + mappings.insert_visibility (item->get_mappings ().get_nodeid (), module_vis); } void @@ -180,9 +183,9 @@ VisibilityResolver::visit (HIR::Enum &enum_item) if (!resolve_visibility (enum_item.get_visibility (), vis)) return; - mappings.insert_visibility (enum_item.get_mappings ().get_defid (), vis); + mappings.insert_visibility (enum_item.get_mappings ().get_nodeid (), vis); for (auto &variant : enum_item.get_variants ()) - mappings.insert_visibility (variant->get_mappings ().get_defid (), vis); + mappings.insert_visibility (variant->get_mappings ().get_nodeid (), vis); } void @@ -208,9 +211,9 @@ VisibilityResolver::visit (HIR::Trait &trait) if (!resolve_visibility (trait.get_visibility (), vis)) return; - mappings.insert_visibility (trait.get_mappings ().get_defid (), vis); + mappings.insert_visibility (trait.get_mappings ().get_nodeid (), vis); for (auto &item : trait.get_trait_items ()) - mappings.insert_visibility (item->get_mappings ().get_defid (), vis); + mappings.insert_visibility (item->get_mappings ().get_nodeid (), vis); } void diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc index a287589e1dc..934331bd7aa 100644 --- a/gcc/rust/util/rust-hir-map.cc +++ b/gcc/rust/util/rust-hir-map.cc @@ -832,19 +832,19 @@ Mappings::lookup_macro_def (NodeId id, AST::MacroRulesDefinition **def) } void -Mappings::insert_visibility (DefId id, Privacy::ModuleVisibility visibility) +Mappings::insert_visibility (NodeId id, Privacy::ModuleVisibility visibility) { visibility_map.insert ({id, visibility}); } bool -Mappings::lookup_visibility (DefId id, Privacy::ModuleVisibility *def) +Mappings::lookup_visibility (NodeId id, Privacy::ModuleVisibility &def) { auto it = visibility_map.find (id); if (it == visibility_map.end ()) return false; - *def = it->second; + def = it->second; return true; } diff --git a/gcc/rust/util/rust-hir-map.h b/gcc/rust/util/rust-hir-map.h index 88cb6823fba..03bfd5f1a72 100644 --- a/gcc/rust/util/rust-hir-map.h +++ b/gcc/rust/util/rust-hir-map.h @@ -319,8 +319,8 @@ public: bool lookup_macro_def (NodeId id, AST::MacroRulesDefinition **def); - void insert_visibility (DefId id, Privacy::ModuleVisibility visibility); - bool lookup_visibility (DefId id, Privacy::ModuleVisibility *def); + void insert_visibility (NodeId id, Privacy::ModuleVisibility visibility); + bool lookup_visibility (NodeId id, Privacy::ModuleVisibility &def); void insert_module_child (NodeId module, NodeId child); Optional &> lookup_module_children (NodeId module); @@ -389,7 +389,7 @@ private: std::map crate_names; // Low level visibility map for each DefId - std::map visibility_map; + std::map visibility_map; // Module tree maps