diff options
| author | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2018-12-01 17:02:51 +0100 |
|---|---|---|
| committer | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2019-05-23 18:51:51 +0200 |
| commit | 2f74d90ef3e4f6d38d4ae331a8f277fe92b3dbce (patch) | |
| tree | 7a8bf34367c30cb00eb01308f6a068212d66b535 /src | |
| parent | 3f87975d656aa9847b3fc9e7310e9308cebfdf8d (diff) | |
| download | rust-2f74d90ef3e4f6d38d4ae331a8f277fe92b3dbce.tar.gz rust-2f74d90ef3e4f6d38d4ae331a8f277fe92b3dbce.zip | |
Update visible_parent_map
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/arena.rs | 1 | ||||
| -rw-r--r-- | src/librustc/query/mod.rs | 2 | ||||
| -rw-r--r-- | src/librustc_metadata/cstore_impl.rs | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/librustc/arena.rs b/src/librustc/arena.rs index 53349773a36..df40d12477d 100644 --- a/src/librustc/arena.rs +++ b/src/librustc/arena.rs @@ -93,6 +93,7 @@ macro_rules! arena_types { >, [few] get_lib_features: rustc::middle::lib_features::LibFeatures, [few] defined_lib_features: rustc::middle::lang_items::LanguageItems, + [few] visible_parent_map: rustc::util::nodemap::DefIdMap<rustc::hir::def_id::DefId>, ], $tcx); ) } diff --git a/src/librustc/query/mod.rs b/src/librustc/query/mod.rs index 84e88acbbde..ad328479533 100644 --- a/src/librustc/query/mod.rs +++ b/src/librustc/query/mod.rs @@ -806,7 +806,7 @@ rustc_queries! { desc { "calculating the missing lang items in a crate" } } query visible_parent_map(_: CrateNum) - -> Lrc<DefIdMap<DefId>> { + -> &'tcx DefIdMap<DefId> { desc { "calculating the visible parent map" } } query missing_extern_crate_item(_: CrateNum) -> bool { diff --git a/src/librustc_metadata/cstore_impl.rs b/src/librustc_metadata/cstore_impl.rs index 2469732a749..72ff80db73c 100644 --- a/src/librustc_metadata/cstore_impl.rs +++ b/src/librustc_metadata/cstore_impl.rs @@ -371,7 +371,7 @@ pub fn provide<'tcx>(providers: &mut Providers<'tcx>) { } } - Lrc::new(visible_parent_map) + tcx.arena.alloc(visible_parent_map) }, ..*providers |