diff options
| author | bors <bors@rust-lang.org> | 2020-08-18 16:18:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-18 16:18:07 +0000 |
| commit | b287b56f97288cc4605329f76e31cb7604474aef (patch) | |
| tree | e60db12c9e755c488ba7f5ba2e9d335be3aa64de | |
| parent | a45dedf3d07dd2c088d89b5e5b7f4c7912b0812f (diff) | |
| parent | 5d40e4515f33343f919aaaa7c37e6ec4c779ea09 (diff) | |
| download | rust-b287b56f97288cc4605329f76e31cb7604474aef.tar.gz rust-b287b56f97288cc4605329f76e31cb7604474aef.zip | |
Auto merge of #75635 - Aaron1011:fix/incr-fn-param-names, r=eddyb
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.
| -rw-r--r-- | src/librustc_metadata/rmeta/decoder/cstore_impl.rs | 4 | ||||
| -rw-r--r-- | src/librustc_metadata/rmeta/encoder.rs | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/librustc_metadata/rmeta/decoder/cstore_impl.rs b/src/librustc_metadata/rmeta/decoder/cstore_impl.rs index 74d29b3df01..50c2ad8148a 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 cb3bf10926b..78abf341e33 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]> { |
