OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hash def-path's better

Browse Source 
actually we shouldn't even hash nested items at all, but that is
addressed in a followup PR
This commit is contained in:
Niko Matsakis 2016-07-28 15:39:02 -04:00
parent 2f9fff2191
commit e359147d12
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/librustc_incremental/calculate_svh.rs
View File

@ -119,6 +119,7 @@ mod svh_visitor {
use rustc::ty::TyCtxt;
use rustc::hir;
use rustc::hir::*;
use rustc::hir::map::DefPath;
use rustc::hir::intravisit as visit;
use rustc::hir::intravisit::{Visitor, FnKind};
@ -135,6 +136,15 @@ mod svh_visitor {
-> Self {
StrictVersionHashVisitor { st: st, tcx: tcx }
}
fn hash_def_path(&mut self, path: &DefPath) {
self.tcx.crate_name(path.krate).hash(self.st);
self.tcx.crate_disambiguator(path.krate).hash(self.st);
for data in &path.data {
data.data.as_interned_str().hash(self.st);
data.disambiguator.hash(self.st);
}
}
}
// To off-load the bulk of the hash-computation on #[derive(Hash)],
@ -289,9 +299,9 @@ mod svh_visitor {
impl<'a, 'tcx> Visitor<'a> for StrictVersionHashVisitor<'a, 'tcx> {
fn visit_nested_item(&mut self, item: ItemId) {
debug!("visit_nested_item: {:?} st={:?}", item, self.st);
let def_path = self.tcx.map.def_path_from_id(item.id);
def_path.hash(self.st);
let def_path = self.tcx.map.def_path_from_id(item.id).unwrap();
debug!("visit_nested_item: def_path={:?} st={:?}", def_path, self.st);
self.hash_def_path(&def_path);
}
fn visit_variant_data(&mut self, s: &'a VariantData, name: Name,