From 5d40e4515f33343f919aaaa7c37e6ec4c779ea09 Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Sun, 16 Aug 2020 19:08:35 -0400 Subject: [PATCH] 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. --- src/librustc_metadata/rmeta/decoder/cstore_impl.rs | 4 ---- src/librustc_metadata/rmeta/encoder.rs | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/librustc_metadata/rmeta/decoder/cstore_impl.rs b/src/librustc_metadata/rmeta/decoder/cstore_impl.rs index 10b89cdd15a..358067fae9c 100644 --- a/src/librustc_metadata/rmeta/decoder/cstore_impl.rs +++ b/src/librustc_metadata/rmeta/decoder/cstore_impl.rs @@ -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) } diff --git a/src/librustc_metadata/rmeta/encoder.rs b/src/librustc_metadata/rmeta/encoder.rs index 0343fbeb0fa..f5227c5600c 100644 --- a/src/librustc_metadata/rmeta/encoder.rs +++ b/src/librustc_metadata/rmeta/encoder.rs @@ -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]> {