diff options
| author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2024-05-03 19:59:43 +0200 |
|---|---|---|
| committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2025-03-17 16:35:25 +0100 |
| commit | c0b38c2aa57b02ceef7925442ae56404d7a20211 (patch) | |
| tree | 94e166effaf71fdc1bb8bb67144c15258aab4478 | |
| parent | 2fc05741bbf83d04260308c17320eef5d9e459db (diff) | |
| download | gcc-c0b38c2aa57b02ceef7925442ae56404d7a20211.zip gcc-c0b38c2aa57b02ceef7925442ae56404d7a20211.tar.gz gcc-c0b38c2aa57b02ceef7925442ae56404d7a20211.tar.bz2 | |
gccrs: Change lookup_hir_generic_param return type
Wrap the function's return type with an optional.
gcc/rust/ChangeLog:
* util/rust-hir-map.cc (Mappings::insert_hir_generic_param): Change
call site to accomodate the new return type.
(Mappings::lookup_hir_generic_param): Wrap the function's return type
with an optional.
* util/rust-hir-map.h: Update the function's prototype.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
| -rw-r--r-- | gcc/rust/util/rust-hir-map.cc | 6 | ||||
| -rw-r--r-- | gcc/rust/util/rust-hir-map.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc index c96743a..c3929d8 100644 --- a/gcc/rust/util/rust-hir-map.cc +++ b/gcc/rust/util/rust-hir-map.cc @@ -571,19 +571,19 @@ void Mappings::insert_hir_generic_param (HIR::GenericParam *param) { auto id = param->get_mappings ().get_hirid (); - rust_assert (lookup_hir_generic_param (id) == nullptr); + rust_assert (!lookup_hir_generic_param (id)); hirGenericParamMappings[id] = param; insert_node_to_hir (param->get_mappings ().get_nodeid (), id); insert_location (id, param->get_locus ()); } -HIR::GenericParam * +tl::optional<HIR::GenericParam *> Mappings::lookup_hir_generic_param (HirId id) { auto it = hirGenericParamMappings.find (id); if (it == hirGenericParamMappings.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 c7d0838..d04232f 100644 --- a/gcc/rust/util/rust-hir-map.h +++ b/gcc/rust/util/rust-hir-map.h @@ -152,7 +152,7 @@ public: tl::optional<HIR::PathExprSegment *> lookup_hir_path_expr_seg (HirId id); void insert_hir_generic_param (HIR::GenericParam *expr); - HIR::GenericParam *lookup_hir_generic_param (HirId id); + tl::optional<HIR::GenericParam *> lookup_hir_generic_param (HirId id); void insert_hir_type (HIR::Type *type); HIR::Type *lookup_hir_type (HirId id); |