nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 23:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #75635 - Aaron1011:fix/incr-fn-param-names, r=eddyb

Browse Source 
Don't use `dep_graph.with_ignore` when encoding fn param names

The call to `with_ignore` was added years ago, and should no longer be
necessary with the modern incremental query infrastructure.

I also removed a related FIXME comment for issue #38501, which was
closed months ago.
This commit is contained in:
bors 2020-08-18 16:18:07 +00:00
commit b287b56f97
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc_metadata/rmeta/decoder/cstore_impl.rs
View File

@ -136,10 +136,6 @@ provide! { <'tcx> tcx, def_id, other, cdata,
item_attrs => { tcx.arena.alloc_from_iter(
cdata.get_item_attrs(def_id.index, tcx.sess).into_iter()
) }
// FIXME(#38501) We've skipped a `read` on the `hir_owner_nodes` of
// a `fn` when encoding, so the dep-tracking wouldn't work.
// This is only used by rustdoc anyway, which shouldn't have
// incremental recompilation ever enabled.
fn_arg_names => { cdata.get_fn_param_names(tcx, def_id.index) }
rendered_const => { cdata.get_rendered_const(def_id.index) }
impl_parent => { cdata.get_parent_impl(def_id.index) }

2
src/librustc_metadata/rmeta/encoder.rs
View File

@ -1089,7 +1089,7 @@ impl EncodeContext<'a, 'tcx> {
}
fn encode_fn_param_names_for_body(&mut self, body_id: hir::BodyId) -> Lazy<[Ident]> {
self.tcx.dep_graph.with_ignore(|| self.lazy(self.tcx.hir().body_param_names(body_id)))
self.lazy(self.tcx.hir().body_param_names(body_id))
}
fn encode_fn_param_names(&mut self, param_names: &[Ident]) -> Lazy<[Ident]> {