diff options
| author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2024-05-03 20:34:58 +0200 |
|---|---|---|
| committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2025-03-17 16:35:25 +0100 |
| commit | bcc66efaf14af971c080b6128ea30d51c2b41516 (patch) | |
| tree | d3f1d12d113ce759b657d2666976d001df53a85c /gcc/rust/util | |
| parent | 8f8d6d1a03ecca39928f98b8045e278bee665b78 (diff) | |
| download | gcc-bcc66efaf14af971c080b6128ea30d51c2b41516.zip gcc-bcc66efaf14af971c080b6128ea30d51c2b41516.tar.gz gcc-bcc66efaf14af971c080b6128ea30d51c2b41516.tar.bz2 | |
gccrs: Change lookup_hir_param return type with optional
Wrap the function's return type within an optional to differentiate
between a null ppointer and a missing value.
gcc/rust/ChangeLog:
* util/rust-hir-map.cc (Mappings::insert_hir_param): Change call site
to accomodate new return type.
(Mappings::lookup_hir_param): Change the function's return type.
* util/rust-hir-map.h: Updat ethe function's prototype.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Diffstat (limited to 'gcc/rust/util')
| -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 025b312..e2c3b98 100644 --- a/gcc/rust/util/rust-hir-map.cc +++ b/gcc/rust/util/rust-hir-map.cc @@ -632,18 +632,18 @@ void Mappings::insert_hir_param (HIR::FunctionParam *param) { auto id = param->get_mappings ().get_hirid (); - rust_assert (lookup_hir_param (id) == nullptr); + rust_assert (!lookup_hir_param (id)); hirParamMappings[id] = param; insert_node_to_hir (param->get_mappings ().get_nodeid (), id); } -HIR::FunctionParam * +tl::optional<HIR::FunctionParam *> Mappings::lookup_hir_param (HirId id) { auto it = hirParamMappings.find (id); if (it == hirParamMappings.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 f6db83d..6f97dcb 100644 --- a/gcc/rust/util/rust-hir-map.h +++ b/gcc/rust/util/rust-hir-map.h @@ -161,7 +161,7 @@ public: tl::optional<HIR::Stmt *> lookup_hir_stmt (HirId id); void insert_hir_param (HIR::FunctionParam *type); - HIR::FunctionParam *lookup_hir_param (HirId id); + tl::optional<HIR::FunctionParam *> lookup_hir_param (HirId id); void insert_hir_self_param (HIR::SelfParam *type); HIR::SelfParam *lookup_hir_self_param (HirId id); |