mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Address review comments

Browse source
This commit is contained in:
Aaron Hill 2022-01-05 10:30:49 -05:00
parent 560c90f5df
commit 4ca275add0
No known key found for this signature in database
GPG key ID: B4087E510E98B164
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_query_system/src/ich/hcx.rs
View file

@ -27,7 +27,9 @@ fn compute_ignored_attr_names() -> FxHashSet<Symbol> {
pub struct StableHashingContext<'a> { pub struct StableHashingContext<'a> {
definitions: &'a Definitions, definitions: &'a Definitions,
cstore: &'a dyn CrateStore, cstore: &'a dyn CrateStore,
sess: &'a Session, // The value of `-Z incremental-ignore-spans`.
// This field should only be used by `debug_opts_incremental_ignore_span`
incremental_ignore_spans: bool,
pub(super) body_resolver: BodyResolver<'a>, pub(super) body_resolver: BodyResolver<'a>,
// Very often, we are hashing something that does not need the // Very often, we are hashing something that does not need the
// `CachingSourceMapView`, so we initialize it lazily. // `CachingSourceMapView`, so we initialize it lazily.
@ -64,7 +66,7 @@ impl<'a> StableHashingContext<'a> {
body_resolver: BodyResolver::Forbidden, body_resolver: BodyResolver::Forbidden,
definitions, definitions,
cstore, cstore,
sess, incremental_ignore_spans: sess.opts.debugging_opts.incremental_ignore_spans,
caching_source_map: None, caching_source_map: None,
raw_source_map: sess.source_map(), raw_source_map: sess.source_map(),
hashing_controls: HashingControls { hashing_controls: HashingControls {
@ -181,6 +183,7 @@ impl<'a> StableHashingContext<'a> {
IGNORED_ATTRIBUTES.with(|attrs| attrs.contains(&name)) IGNORED_ATTRIBUTES.with(|attrs| attrs.contains(&name))
} }
#[inline]
pub fn hashing_controls(&self) -> HashingControls { pub fn hashing_controls(&self) -> HashingControls {
self.hashing_controls.clone() self.hashing_controls.clone()
} }
@ -201,7 +204,7 @@ impl<'a> rustc_span::HashStableContext for StableHashingContext<'a> {
#[inline] #[inline]
fn debug_opts_incremental_ignore_spans(&self) -> bool { fn debug_opts_incremental_ignore_spans(&self) -> bool {
self.sess.opts.debugging_opts.incremental_ignore_spans self.incremental_ignore_spans
} }
#[inline] #[inline]