From 2d9d7036f3bc831f34972cf243f8012d45da0ff0 Mon Sep 17 00:00:00 2001 From: Pierre-Emmanuel Patry Date: Thu, 25 Apr 2024 10:48:47 +0200 Subject: gccrs: Change return type for lookup_hir_item to optional gcc/rust/ChangeLog: * backend/rust-compile-resolve-path.cc (HIRCompileBase::query_compile): Adapt function call to new return type. * backend/rust-mangle-v0.cc (v0_path): Likewise. * checks/errors/rust-const-checker.cc (ConstChecker::check_function_call): Likewise. * checks/errors/rust-unsafe-checker.cc (UnsafeChecker::check_use_of_static): Likewise. (UnsafeChecker::check_function_call): Likewise. (UnsafeChecker::check_function_attr): Likewise. * checks/lints/rust-lint-marklive.cc (MarkLive::go): Likewise. (MarkLive::visit): Likewise. * typecheck/rust-hir-trait-resolve.cc (TraitResolver::resolve_path_to_trait): Likewise. * typecheck/rust-type-util.cc (query_type): Likewise. * util/rust-hir-map.cc (Mappings::insert_hir_item): Likewise. (Mappings::lookup_hir_item): Change function return type to use optional. * util/rust-hir-map.h: Update function prototype. Signed-off-by: Pierre-Emmanuel Patry --- gcc/rust/util/rust-hir-map.cc | 7 +++---- gcc/rust/util/rust-hir-map.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'gcc/rust/util') diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc index 57a7667..535353b 100644 --- a/gcc/rust/util/rust-hir-map.cc +++ b/gcc/rust/util/rust-hir-map.cc @@ -366,19 +366,18 @@ void Mappings::insert_hir_item (HIR::Item *item) { auto id = item->get_mappings ().get_hirid (); - rust_assert (lookup_hir_item (id) == nullptr); + rust_assert (!lookup_hir_item (id).has_value ()); hirItemMappings[id] = item; insert_node_to_hir (item->get_mappings ().get_nodeid (), id); } -HIR::Item * +tl::optional Mappings::lookup_hir_item (HirId id) { auto it = hirItemMappings.find (id); if (it == hirItemMappings.end ()) - return nullptr; - + return tl::nullopt; return it->second; } diff --git a/gcc/rust/util/rust-hir-map.h b/gcc/rust/util/rust-hir-map.h index 6ed3bee..e6df05b 100644 --- a/gcc/rust/util/rust-hir-map.h +++ b/gcc/rust/util/rust-hir-map.h @@ -115,7 +115,7 @@ public: HIR::Item *lookup_local_defid (CrateNum crateNum, LocalDefId id); void insert_hir_item (HIR::Item *item); - HIR::Item *lookup_hir_item (HirId id); + tl::optional lookup_hir_item (HirId id); void insert_hir_enumitem (HIR::Enum *parent, HIR::EnumItem *item); std::pair lookup_hir_enumitem (HirId id); -- cgit v1.1