62c32aeeab
Currently `SourceMap` is constructed slightly later than `SessionGlobals`, and inserted. This commit changes things so they are done at the same time. Benefits: - `SessionGlobals::source_map` changes from `Lock<Option<Lrc<SourceMap>>>` to `Option<Lrc<SourceMap>>`. It's still optional, but mutability isn't required because it's initialized at construction. - `set_source_map` is removed, simplifying `run_compiler`, which is good because that's a critical function and it's nice to make it simpler. This requires moving things around a bit, so the necessary inputs are available when `SessionGlobals` is created, in particular the `loader` and `hash_kind`, which are no longer computed by `build_session`. These inputs are captured by the new `SourceMapInputs` type, which is threaded through various places.
41 lines
1.7 KiB
Rust
41 lines
1.7 KiB
Rust
use crate::definitions::{DefKey, DefPathData, DisambiguatedDefPathData};
|
|
use rustc_data_structures::stable_hasher::Hash64;
|
|
use rustc_span::def_id::{DefPathHash, StableCrateId};
|
|
use rustc_span::edition::Edition;
|
|
use rustc_span::{create_session_globals_then, Symbol};
|
|
|
|
#[test]
|
|
fn def_path_hash_depends_on_crate_id() {
|
|
// This test makes sure that *both* halves of a DefPathHash depend on
|
|
// the crate-id of the defining crate. This is a desirable property
|
|
// because the crate-id can be more easily changed than the DefPath
|
|
// of an item, so, in the case of a crate-local DefPathHash collision,
|
|
// the user can simply "roll the dice again" for all DefPathHashes in
|
|
// the crate by changing the crate disambiguator (e.g. via bumping the
|
|
// crate's version number).
|
|
|
|
create_session_globals_then(Edition::Edition2024, None, || {
|
|
let id0 = StableCrateId::new(Symbol::intern("foo"), false, vec!["1".to_string()], "");
|
|
let id1 = StableCrateId::new(Symbol::intern("foo"), false, vec!["2".to_string()], "");
|
|
|
|
let h0 = mk_test_hash(id0);
|
|
let h1 = mk_test_hash(id1);
|
|
|
|
assert_ne!(h0.stable_crate_id(), h1.stable_crate_id());
|
|
assert_ne!(h0.local_hash(), h1.local_hash());
|
|
|
|
fn mk_test_hash(stable_crate_id: StableCrateId) -> DefPathHash {
|
|
let parent_hash = DefPathHash::new(stable_crate_id, Hash64::ZERO);
|
|
|
|
let key = DefKey {
|
|
parent: None,
|
|
disambiguated_data: DisambiguatedDefPathData {
|
|
data: DefPathData::CrateRoot,
|
|
disambiguator: 0,
|
|
},
|
|
};
|
|
|
|
key.compute_stable_hash(parent_hash)
|
|
}
|
|
})
|
|
}
|