From 0e021ad76cfb2fb4507e3713522707e109ee6ddd Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 2 Mar 2020 22:30:20 +0100
Subject: [PATCH] switch extern_statics map to symbols

---
 src/machine.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/machine.rs b/src/machine.rs
index 331e75414a0b..c8705eb29e8c 100644
--- a/src/machine.rs
+++ b/src/machine.rs
@@ -16,7 +16,7 @@
     Ty,
 };
 use rustc_ast::attr;
-use rustc_span::{source_map::Span, symbol::sym};
+use rustc_span::{source_map::Span, symbol::{sym, Symbol}};
 
 use crate::*;
 
@@ -75,7 +75,7 @@ pub struct MemoryExtra {
     pub intptrcast: intptrcast::MemoryExtra,
 
     /// Mapping extern static names to their canonical allocation.
-    pub(crate) extern_statics: HashMap<&'static str, AllocId>,
+    pub(crate) extern_statics: HashMap<Symbol, AllocId>,
 
     /// The random number generator used for resolving non-determinism.
     /// Needs to be queried by ptr_to_int, hence needs interior mutability.
@@ -111,7 +111,7 @@ pub fn init_extern_statics<'mir, 'tcx>(
                 this.memory
                     .extra
                     .extern_statics
-                    .insert("__cxa_thread_atexit_impl", place.ptr.assert_ptr().alloc_id)
+                    .insert(Symbol::intern("__cxa_thread_atexit_impl"), place.ptr.assert_ptr().alloc_id)
                     .unwrap_none();
             }
             _ => {} // No "extern statics" supported on this platform
@@ -310,11 +310,11 @@ fn canonical_alloc_id(mem: &Memory<'mir, 'tcx, Self>, id: AllocId) -> AllocId {
         };
         let attrs = tcx.get_attrs(def_id);
         let link_name = match attr::first_attr_value_str_by_name(&attrs, sym::link_name) {
-            Some(name) => name.as_str(),
-            None => tcx.item_name(def_id).as_str(),
+            Some(name) => name,
+            None => tcx.item_name(def_id),
         };
         // Check if we know this one.
-        if let Some(canonical_id) = mem.extra.extern_statics.get(&*link_name) {
+        if let Some(canonical_id) = mem.extra.extern_statics.get(&link_name) {
             trace!("canonical_alloc_id: {:?} ({}) -> {:?}", id, link_name, canonical_id);
             *canonical_id
         } else {