From 85757be59aa401f250cadb50a4f6d75ffb526249 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Sat, 3 Apr 2021 01:00:45 +0200 Subject: Allow interning strings --- crates/hir_def/src/intern.rs | 55 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 9 deletions(-) (limited to 'crates/hir_def/src') diff --git a/crates/hir_def/src/intern.rs b/crates/hir_def/src/intern.rs index bc0307dbc..d163f633f 100644 --- a/crates/hir_def/src/intern.rs +++ b/crates/hir_def/src/intern.rs @@ -3,17 +3,20 @@ //! Eventually this should probably be replaced with salsa-based interning. use std::{ + collections::HashMap, fmt::{self, Debug}, hash::{BuildHasherDefault, Hash}, ops::Deref, sync::Arc, }; -use dashmap::{DashMap, SharedValue}; +use dashmap::{lock::RwLockWriteGuard, DashMap, SharedValue}; use once_cell::sync::OnceCell; use rustc_hash::FxHasher; type InternMap = DashMap, (), BuildHasherDefault>; +type Guard = + RwLockWriteGuard<'static, HashMap, SharedValue<()>, BuildHasherDefault>>; #[derive(Hash)] pub struct Interned { @@ -22,10 +25,22 @@ pub struct Interned { impl Interned { pub fn new(obj: T) -> Self { + match Interned::lookup(&obj) { + Ok(this) => this, + Err(shard) => { + let arc = Arc::new(obj); + Self::alloc(arc, shard) + } + } + } +} + +impl Interned { + fn lookup(obj: &T) -> Result> { let storage = T::storage().get(); - let shard_idx = storage.determine_map(&obj); + let shard_idx = storage.determine_map(obj); let shard = &storage.shards()[shard_idx]; - let mut shard = shard.write(); + let shard = shard.write(); // Atomically, // - check if `obj` is already in the map @@ -34,13 +49,15 @@ impl Interned { // This needs to be atomic (locking the shard) to avoid races with other thread, which could // insert the same object between us looking it up and inserting it. - // FIXME: avoid double lookup by using raw entry API (once stable, or when hashbrown can be - // plugged into dashmap) - if let Some((arc, _)) = shard.get_key_value(&obj) { - return Self { arc: arc.clone() }; + // FIXME: avoid double lookup/hashing by using raw entry API (once stable, or when + // hashbrown can be plugged into dashmap) + match shard.get_key_value(obj) { + Some((arc, _)) => Ok(Self { arc: arc.clone() }), + None => Err(shard), } + } - let arc = Arc::new(obj); + fn alloc(arc: Arc, mut shard: Guard) -> Self { let arc2 = arc.clone(); shard.insert(arc2, SharedValue::new(())); @@ -49,6 +66,18 @@ impl Interned { } } +impl Interned { + pub fn new_str(s: &str) -> Self { + match Interned::lookup(s) { + Ok(this) => this, + Err(shard) => { + let arc = Arc::::from(s); + Self::alloc(arc, shard) + } + } + } +} + impl Drop for Interned { #[inline] fn drop(&mut self) { @@ -98,6 +127,14 @@ impl PartialEq for Interned { impl Eq for Interned {} +impl PartialEq for Interned { + fn eq(&self, other: &Self) -> bool { + Arc::ptr_eq(&self.arc, &other.arc) + } +} + +impl Eq for Interned {} + impl AsRef for Interned { #[inline] fn as_ref(&self) -> &T { @@ -157,4 +194,4 @@ macro_rules! impl_internable { )+ }; } -impl_internable!(crate::type_ref::TypeRef, crate::type_ref::TraitRef, crate::path::ModPath); +impl_internable!(crate::type_ref::TypeRef, crate::type_ref::TraitRef, crate::path::ModPath, str); -- cgit v1.2.3