bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Include (potentially remapped) working dir in crate hash

Browse source 
Fixes #85019

A `SourceFile` created during compilation may have a relative
path (e.g. if rustc itself is invoked with a relative path).
When we write out crate metadata, we convert all relative paths
to absolute paths using the current working direction.

However, the working directory is not included in the crate hash.
This means that the crate metadata can change while the crate
hash remains the same. Among other problems, this can cause a
fingerprint mismatch ICE, since incremental compilation uses
the crate metadata hash to determine if a foreign query is green.

This commit moves the field holding the working directory from
`Session` to `Options`, including it as part of the crate hash.
This commit is contained in:
Aaron Hill 2021-08-12 15:30:40 -05:00
parent c0490a2dbb
commit a895069c50
No known key found for this signature in database
GPG key ID: B4087E510E98B164
10 changed files with 61 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_session/src/options.rs
View file

@ -10,6 +10,7 @@ use rustc_target::spec::{RelocModel, RelroLevel, SplitDebuginfo, TargetTriple, T
use rustc_feature::UnstableFeatures;
use rustc_span::edition::Edition;
use rustc_span::RealFileName;
use rustc_span::SourceFileHashAlgorithm;
use std::collections::BTreeMap;
@ -203,6 +204,9 @@ top_level_options!(
json_unused_externs: bool [UNTRACKED],
pretty: Option<PpMode> [UNTRACKED],
/// The (potentially remapped) working directory
working_dir: RealFileName [TRACKED],
}
);