Skip to content

Commit

Permalink
[incremental] Cache AdtDef hashes
Browse files Browse the repository at this point in the history
Part of #47294
  • Loading branch information
wesleywiser committed Jan 16, 2018
1 parent adc9d86 commit 14780b3
Showing 1 changed file with 28 additions and 11 deletions.
39 changes: 28 additions & 11 deletions src/librustc/ty/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use hir::def::{Def, CtorKind, ExportMap};
use hir::def_id::{CrateNum, DefId, DefIndex, LocalDefId, CRATE_DEF_INDEX, LOCAL_CRATE};
use hir::map::DefPathData;
use hir::svh::Svh;
use ich::Fingerprint;
use ich::StableHashingContext;
use middle::const_val::ConstVal;
use middle::lang_items::{FnTraitLangItem, FnMutTraitLangItem, FnOnceTraitLangItem};
Expand All @@ -37,6 +38,7 @@ use util::common::ErrorReported;
use util::nodemap::{NodeSet, DefIdMap, FxHashMap, FxHashSet};

use serialize::{self, Encodable, Encoder};
use std::cell::RefCell;
use std::collections::BTreeMap;
use std::cmp;
use std::fmt;
Expand Down Expand Up @@ -1476,17 +1478,32 @@ impl<'gcx> HashStable<StableHashingContext<'gcx>> for AdtDef {
fn hash_stable<W: StableHasherResult>(&self,
hcx: &mut StableHashingContext<'gcx>,
hasher: &mut StableHasher<W>) {
let ty::AdtDef {
did,
ref variants,
ref flags,
ref repr,
} = *self;

did.hash_stable(hcx, hasher);
variants.hash_stable(hcx, hasher);
flags.hash_stable(hcx, hasher);
repr.hash_stable(hcx, hasher);
thread_local! {
static CACHE: RefCell<FxHashMap<usize, Fingerprint>> =
RefCell::new(FxHashMap());
}

let hash: Fingerprint = CACHE.with(|cache| {
let addr = self as *const AdtDef as usize;
*cache.borrow_mut().entry(addr).or_insert_with(|| {
let ty::AdtDef {
did,
ref variants,
ref flags,
ref repr,
} = *self;

let mut hasher = StableHasher::new();
did.hash_stable(hcx, &mut hasher);
variants.hash_stable(hcx, &mut hasher);
flags.hash_stable(hcx, &mut hasher);
repr.hash_stable(hcx, &mut hasher);

hasher.finish()
})
});

hash.hash_stable(hcx, hasher);
}
}

Expand Down

0 comments on commit 14780b3

Please sign in to comment.