2 files changed, 7 insertions, 7 deletions
diff --git a/gcc/rust/metadata/rust-export-metadata.cc b/gcc/rust/metadata/rust-export-metadata.cc
index 08ed0a4..46afe35 100644
--- a/gcc/rust/metadata/rust-export-metadata.cc
+++ b/gcc/rust/metadata/rust-export-metadata.cc
@@ -58,7 +58,7 @@ ExportContext::emit_trait (const HIR::Trait &trait)
   // lookup the AST node for this
   AST::Item *item = nullptr;
   bool ok
-    = mappings->lookup_ast_item (trait.get_mappings ().get_nodeid (), &item);
+    = mappings.lookup_ast_item (trait.get_mappings ().get_nodeid (), &item);
   rust_assert (ok);
 
   std::stringstream oss;
@@ -73,7 +73,7 @@ ExportContext::emit_function (const HIR::Function &fn)
 {
   // lookup the AST node for this
   AST::Item *item = nullptr;
-  bool ok = mappings->lookup_ast_item (fn.get_mappings ().get_nodeid (), &item);
+  bool ok = mappings.lookup_ast_item (fn.get_mappings ().get_nodeid (), &item);
   rust_assert (ok);
 
   // is this a CFG macro or not
@@ -120,7 +120,7 @@ ExportContext::emit_macro (NodeId macro)
   AST::Dump dumper (oss);
 
   AST::Item *item;
-  auto ok = mappings->lookup_ast_item (macro, &item);
+  auto ok = mappings.lookup_ast_item (macro, &item);
   rust_assert (ok);
 
   dumper.go (*item);
@@ -166,7 +166,7 @@ private:
 };
 
 PublicInterface::PublicInterface (HIR::Crate &crate)
-  : crate (crate), mappings (*Analysis::Mappings::get ()), context ()
+  : crate (crate), mappings (Analysis::Mappings::get ()), context ()
 {}
 
 void
@@ -363,9 +363,9 @@ PublicInterface::is_crate_public (const HIR::VisItem &item)
 std::string
 PublicInterface::expected_metadata_filename ()
 {
-  auto mappings = Analysis::Mappings::get ();
+  auto &mappings = Analysis::Mappings::get ();
 
-  const std::string current_crate_name = mappings->get_current_crate_name ();
+  const std::string current_crate_name = mappings.get_current_crate_name ();
   return current_crate_name + extension_path;
 }
 
diff --git a/gcc/rust/metadata/rust-export-metadata.h b/gcc/rust/metadata/rust-export-metadata.h
index bc5e5d7..ee006cd 100644
--- a/gcc/rust/metadata/rust-export-metadata.h
+++ b/gcc/rust/metadata/rust-export-metadata.h
@@ -53,7 +53,7 @@ public:
   const std::string &get_interface_buffer () const;
 
 private:
-  Analysis::Mappings *mappings;
+  Analysis::Mappings &mappings;
 
   std::vector<std::reference_wrapper<const HIR::Module>> module_stack;
   std::string public_interface_buffer;