Revert "Add canary and journaling."

This reverts commit 58322d0021.

components/hashglobe/src/diagnostic.rs

@@ -1,30 +1,15 @@
 use hash_map::HashMap;
 use std::borrow::Borrow;
 use std::hash::{BuildHasher, Hash};
-use table::SafeHash;
 
 use FailedAllocationError;
 
-#[cfg(target_pointer_width = "32")]
-const CANARY: usize = 0x42cafe99;
-#[cfg(target_pointer_width = "64")]
-const CANARY: usize = 0x42cafe9942cafe99;
-
-#[derive(Clone, Debug)]
-enum JournalEntry {
-    Insert(SafeHash),
-    GetOrInsertWith(SafeHash),
-    Remove(SafeHash),
-    DidClear(usize),
-}
-
 #[derive(Clone, Debug)]
 pub struct DiagnosticHashMap<K, V, S>
     where K: Eq + Hash,
           S: BuildHasher
 {
-    map: HashMap<K, (usize, V), S>,
+    map: HashMap<K, V, S>,
-    journal: Vec<JournalEntry>,
     readonly: bool,
 }
 
@@ -33,7 +18,7 @@ impl<K: Hash + Eq, V, S: BuildHasher> DiagnosticHashMap<K, V, S>
           S: BuildHasher
 {
     #[inline(always)]
-    pub fn inner(&self) -> &HashMap<K, (usize, V), S> {
+    pub fn inner(&self) -> &HashMap<K, V, S> {
         &self.map
     }
 
@@ -47,27 +32,12 @@ impl<K: Hash + Eq, V, S: BuildHasher> DiagnosticHashMap<K, V, S>
     pub fn end_mutation(&mut self) {
         assert!(!self.readonly);
         self.readonly = true;
-
-        let mut position = 0;
-        let mut bad_canary: Option<(usize, *const usize)> = None;
-        for (_,v) in self.map.iter() {
-            let canary_ref = &v.0;
-            if *canary_ref == CANARY {
-                position += 1;
-                continue;
-            }
-            bad_canary = Some((*canary_ref, canary_ref));
-        }
-        if let Some(c) = bad_canary {
-            self.report_corruption(c.0, c.1, position);
-        }
     }
 
     #[inline(always)]
     pub fn with_hasher(hash_builder: S) -> Self {
         Self {
-            map: HashMap::<K, (usize, V), S>::with_hasher(hash_builder),
+            map: HashMap::<K, V, S>::with_hasher(hash_builder),
-            journal: Vec::new(),
             readonly: true,
         }
     }
@@ -95,7 +65,7 @@ impl<K: Hash + Eq, V, S: BuildHasher> DiagnosticHashMap<K, V, S>
         where K: Borrow<Q>,
               Q: Hash + Eq
     {
-        self.map.get(k).map(|v| &v.1)
+        self.map.get(k)
     }
 
     #[inline(always)]
@@ -105,17 +75,14 @@ impl<K: Hash + Eq, V, S: BuildHasher> DiagnosticHashMap<K, V, S>
         default: F
     ) -> Result<&mut V, FailedAllocationError> {
         assert!(!self.readonly);
-        self.journal.push(JournalEntry::GetOrInsertWith(self.map.make_hash(&key)));
         let entry = self.map.try_entry(key)?;
-        Ok(&mut entry.or_insert_with(|| (CANARY, default())).1)
+        Ok(entry.or_insert_with(default))
     }
 
     #[inline(always)]
     pub fn try_insert(&mut self, k: K, v: V) -> Result<Option<V>, FailedAllocationError> {
         assert!(!self.readonly);
-        self.journal.push(JournalEntry::Insert(self.map.make_hash(&k)));
+        self.map.try_insert(k, v)
-        let old = self.map.try_insert(k, (CANARY, v))?;
-        Ok(old.map(|x| x.1))
     }
 
     #[inline(always)]
@@ -124,8 +91,7 @@ impl<K: Hash + Eq, V, S: BuildHasher> DiagnosticHashMap<K, V, S>
               Q: Hash + Eq
     {
         assert!(!self.readonly);
-        self.journal.push(JournalEntry::Remove(self.map.make_hash(k)));
+        self.map.remove(k)
-        self.map.remove(k).map(|x| x.1)
     }
 
     #[inline(always)]
@@ -133,36 +99,9 @@ impl<K: Hash + Eq, V, S: BuildHasher> DiagnosticHashMap<K, V, S>
         // We handle scoped mutations for the caller here, since callsites that
         // invoke clear() don't benefit from the coalescing we do around insertion.
         self.begin_mutation();
-        self.journal.clear();
-        self.journal.push(JournalEntry::DidClear(self.map.raw_capacity()));
         self.map.clear();
         self.end_mutation();
     }
-
-    #[inline(never)]
-    fn report_corruption(
-        &mut self,
-        canary: usize,
-        canary_addr: *const usize,
-        position: usize
-    ) {
-        unsafe {
-            Gecko_AddBufferToCrashReport(
-                self.journal.as_ptr() as *const _,
-                self.journal.len() * ::std::mem::size_of::<JournalEntry>(),
-            );
-        }
-        panic!(
-            "HashMap Corruption (sz={}, cap={}, pairsz={}, cnry={:#x}, pos={}, base_addr={:?}, cnry_addr={:?})",
-            self.map.len(),
-            self.map.raw_capacity(),
-            ::std::mem::size_of::<(K, (usize, V))>(),
-            canary,
-            position,
-            self.map.raw_buffer(),
-            canary_addr,
-        );
-    }
 }
 
 impl<K, V, S> PartialEq for DiagnosticHashMap<K, V, S>
@@ -189,7 +128,6 @@ impl<K, V, S> Default for DiagnosticHashMap<K, V, S>
     fn default() -> Self {
         Self {
             map: HashMap::default(),
-            journal: Vec::new(),
             readonly: true,
         }
     }
@@ -203,8 +141,3 @@ impl<K: Hash + Eq, V, S: BuildHasher> Drop for DiagnosticHashMap<K, V, S>
         debug_assert!(self.readonly, "Dropped while mutating");
     }
 }
-
-extern "C" {
-    pub fn Gecko_AddBufferToCrashReport(addr: *const ::std::os::raw::c_void,
-                                        bytes: usize);
-}

components/hashglobe/src/hash_map.rs

@@ -534,7 +534,7 @@ impl<K, V, S> HashMap<K, V, S>
     where K: Eq + Hash,
           S: BuildHasher
 {
-    pub fn make_hash<X: ?Sized>(&self, x: &X) -> SafeHash
+    fn make_hash<X: ?Sized>(&self, x: &X) -> SafeHash
         where X: Hash
     {
         table::make_hash(&self.hash_builder, x)
@@ -683,17 +683,10 @@ impl<K, V, S> HashMap<K, V, S>
 
     /// Returns the hash map's raw capacity.
     #[inline]
-    pub fn raw_capacity(&self) -> usize {
+    fn raw_capacity(&self) -> usize {
         self.table.capacity()
     }
 
-    /// Returns a raw pointer to the table's buffer.
-    #[inline]
-    pub fn raw_buffer(&self) -> *const u8 {
-        assert!(self.len() != 0);
-        self.table.raw_buffer()
-    }
-
     /// Reserves capacity for at least `additional` more elements to be inserted
     /// in the `HashMap`. The collection may reserve more space to avoid
     /// frequent reallocations.

components/hashglobe/src/table.rs

@@ -182,7 +182,7 @@ pub struct GapThenFull<K, V, M> {
 
 /// A hash that is not zero, since we use a hash of zero to represent empty
 /// buckets.
-#[derive(PartialEq, Copy, Clone, Debug)]
+#[derive(PartialEq, Copy, Clone)]
 pub struct SafeHash {
     hash: HashUint,
 }
@@ -816,12 +816,6 @@ impl<K, V> RawTable<K, V> {
         }
     }
 
-    /// Returns a raw pointer to the table's buffer.
-    #[inline]
-    pub fn raw_buffer(&self) -> *const u8 {
-        self.hashes.ptr() as *const u8
-    }
-
     /// Creates a new raw table from a given capacity. All buckets are
     /// initially empty.
     pub fn new(capacity: usize) -> Result<RawTable<K, V>, FailedAllocationError> {