2 files changed, 5 insertions, 8 deletions
diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc
index 16c271d..113e316 100644
--- a/gcc/rust/util/rust-hir-map.cc
+++ b/gcc/rust/util/rust-hir-map.cc
@@ -110,14 +110,11 @@ Mappings::Mappings ()
 
 Mappings::~Mappings () { delete builtinMarker; }
 
-Mappings *
+Mappings &
 Mappings::get ()
 {
-  static std::unique_ptr<Mappings> instance;
-  if (!instance)
-    instance = std::unique_ptr<Mappings> (new Mappings ());
-
-  return instance.get ();
+  static Mappings instance{};
+  return instance;
 }
 
 CrateNum
diff --git a/gcc/rust/util/rust-hir-map.h b/gcc/rust/util/rust-hir-map.h
index 06da335..b238f14 100644
--- a/gcc/rust/util/rust-hir-map.h
+++ b/gcc/rust/util/rust-hir-map.h
@@ -74,7 +74,7 @@ private:
 class Mappings
 {
 public:
-  static Mappings *get ();
+  static Mappings &get ();
   ~Mappings ();
 
   CrateNum get_next_crate_num (const std::string &name);
@@ -390,7 +390,7 @@ private:
   std::map<HirId, HIR::Trait *> hirTraitItemsToTraitMappings;
   std::map<HirId, HIR::Pattern *> hirPatternMappings;
   std::map<LangItem::Kind, DefId> lang_item_mappings;
-  std::map<NodeId, const Resolver::CanonicalPath> paths;
+  std::map<NodeId, Resolver::CanonicalPath> paths;
   std::map<NodeId, location_t> locations;
   std::map<NodeId, HirId> nodeIdToHirMappings;
   std::map<HirId, NodeId> hirIdToNodeMappings;