Skip to content

Commit ac45cf7

Browse files
Remove the DefPathHash from the HIR hash
1 parent ec1783a commit ac45cf7

1 file changed

Lines changed: 4 additions & 10 deletions

File tree

  • compiler/rustc_ast_lowering/src

compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -506,17 +506,12 @@ fn index_crate<'a, 'b>(
506506

507507
/// Compute the hash for the HIR of the full crate.
508508
/// This hash will then be part of the crate_hash which is stored in the metadata.
509-
fn compute_hir_hash(
510-
tcx: TyCtxt<'_>,
511-
owners: &IndexSlice<LocalDefId, hir::MaybeOwner<'_>>,
512-
) -> Fingerprint {
509+
fn compute_hir_hash(owners: &IndexSlice<LocalDefId, hir::MaybeOwner<'_>>) -> Fingerprint {
513510
owners
514511
.iter_enumerated()
515-
.filter_map(|(def_id, info)| {
512+
.filter_map(|(_, info)| {
516513
let info = info.as_owner()?;
517-
let dph = tcx.hir_def_path_hash(def_id).0;
518-
let info_finger = info.fingerprint();
519-
Some(dph.combine(info_finger))
514+
Some(info.fingerprint())
520515
})
521516
.reduce(Fingerprint::combine_commutative)
522517
.expect("HIR hash requested without any content")
@@ -556,8 +551,7 @@ pub fn lower_to_hir(tcx: TyCtxt<'_>, (): ()) -> mid_hir::Crate<'_> {
556551
}
557552

558553
// Don't hash unless necessary, because it's expensive.
559-
let opt_hir_hash =
560-
if tcx.needs_hir_hash() { Some(compute_hir_hash(tcx, &owners)) } else { None };
554+
let opt_hir_hash = if tcx.needs_hir_hash() { Some(compute_hir_hash(&owners)) } else { None };
561555

562556
let delayed_resolver = Steal::new((resolver, krate));
563557
mid_hir::Crate::new(owners, delayed_ids, delayed_resolver, opt_hir_hash)

0 commit comments

Comments
 (0)