Change crate_num_to_nodeid return type

Change the function's return type to an optional.

gcc/rust/ChangeLog:

	* resolve/rust-ast-resolve-toplevel.h: Adapt the code to the new
	return type.
	* rust-session-manager.cc (Session::load_extern_crate): Likewise.
	* util/rust-hir-map.cc (Mappings::crate_num_to_nodeid): Change the
	return type.
	* util/rust-hir-map.h: Update the function's prototype.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>

diff --git a/gcc/rust/resolve/rust-ast-resolve-toplevel.h b/gcc/rust/resolve/rust-ast-resolve-toplevel.h
index c5938d3ff8072851157b86f335fca7369727bf75..ceac7edd341563d438fc32b374b312a9dfb2be11 100644 (file)
--- a/gcc/rust/resolve/rust-ast-resolve-toplevel.h
+++ b/gcc/rust/resolve/rust-ast-resolve-toplevel.h
@@ -429,8 +429,7 @@ public:
     if (extern_crate.references_self ())
       {
        CrateNum crate_num = mappings.get_current_crate ();
-       bool ok = mappings.crate_num_to_nodeid (crate_num, resolved_crate);
-       rust_assert (ok);
+       resolved_crate = mappings.crate_num_to_nodeid (crate_num).value ();
       }
     else
       {
@@ -442,11 +441,9 @@ public:
                           extern_crate.get_referenced_crate ().c_str ());
            return;
          }
-       auto found_crate_num = cnum.value ();
-
-       bool ok
-         = mappings.crate_num_to_nodeid (found_crate_num, resolved_crate);
-       if (!ok)
+       if (auto resolved = mappings.crate_num_to_nodeid (*cnum))
+         resolved_crate = resolved.value ();
+       else
          {
            rust_internal_error_at (extern_crate.get_locus (),
                                    "failed to resolve crate to nodeid");

diff --git a/gcc/rust/rust-session-manager.cc b/gcc/rust/rust-session-manager.cc
index 919c4a90db6cc69ada1e5d3fd000d1c622689cec..f132cf99f1400665a65ee32ee9df1830b21d52c0 100644 (file)
--- a/gcc/rust/rust-session-manager.cc
+++ b/gcc/rust/rust-session-manager.cc
@@ -1050,12 +1050,10 @@ Session::load_extern_crate (const std::string &crate_name, location_t locus)
   // has it already been loaded?
   if (auto crate_num = mappings.lookup_crate_name (crate_name))
     {
-      NodeId resolved_node_id = UNKNOWN_NODEID;
-      bool resolved
-       = mappings.crate_num_to_nodeid (*crate_num, resolved_node_id);
-      rust_assert (resolved);
+      auto resolved_node_id = mappings.crate_num_to_nodeid (*crate_num);
+      rust_assert (resolved_node_id);
 
-      return resolved_node_id;
+      return *resolved_node_id;
     }
 
   std::string relative_import_path = "";

diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc
index c0e7bacf06d955558a15361750c9e8d309f5cf59..d359df5cd599a06ae7e590667a3b0c602e3330cc 100644 (file)
--- a/gcc/rust/util/rust-hir-map.cc
+++ b/gcc/rust/util/rust-hir-map.cc
@@ -175,15 +175,14 @@ Mappings::lookup_crate_name (const std::string &crate_name) const
   return tl::nullopt;
 }
 
-bool
-Mappings::crate_num_to_nodeid (const CrateNum &crate_num, NodeId &node_id) const
+tl::optional<NodeId>
+Mappings::crate_num_to_nodeid (const CrateNum &crate_num) const
 {
   auto it = ast_crate_mappings.find (crate_num);
   if (it == ast_crate_mappings.end ())
-    return false;
+    return tl::nullopt;
 
-  node_id = it->second->get_node_id ();
-  return true;
+  return it->second->get_node_id ();
 }
 
 bool

diff --git a/gcc/rust/util/rust-hir-map.h b/gcc/rust/util/rust-hir-map.h
index e7ed4257a535a0eaf80c5598913e4a58a491e0d7..015c3c245ef2ab8ba011c5950ecb9c407dfcf96b 100644 (file)
--- a/gcc/rust/util/rust-hir-map.h
+++ b/gcc/rust/util/rust-hir-map.h
@@ -85,7 +85,7 @@ public:
   std::string get_current_crate_name () const;
   tl::optional<CrateNum>
   lookup_crate_name (const std::string &crate_name) const;
-  bool crate_num_to_nodeid (const CrateNum &crate_num, NodeId &node_id) const;
+  tl::optional<NodeId> crate_num_to_nodeid (const CrateNum &crate_num) const;
   bool node_is_crate (NodeId node_id) const;
 
   NodeId get_next_node_id ();