Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-28 20:16:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

On-demandify associated item retrieval

Browse Source
This commit is contained in:
Taylor Cramer
2017-03-20 02:37:52 -07:00
parent 6eb9960d36
commit 4cd28a7387
2 changed files with 46 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/librustc/ty/mod.rs
+45 -49
View File
@@ -2049,55 +2049,7 @@ pub fn custom_coerce_unsized_kind(self, did: DefId) -> adjustment::CustomCoerceU
}
pub fn associated_item(self, def_id: DefId) -> AssociatedItem {
if !def_id.is_local() {
return queries::associated_item::get(self, DUMMY_SP, def_id);
}
self.maps.associated_item.memoize(def_id, || {
// When the user asks for a given associated item, we
// always go ahead and convert all the associated items in
// the container. Note that we are also careful only to
// ever register a read on the *container* of the assoc
// item, not the assoc item itself. This prevents changes
// in the details of an item (for example, the type to
// which an associated type is bound) from contaminating
// those tasks that just need to scan the names of items
// and so forth.
let id = self.hir.as_local_node_id(def_id).unwrap();
let parent_id = self.hir.get_parent(id);
let parent_def_id = self.hir.local_def_id(parent_id);
let parent_item = self.hir.expect_item(parent_id);
match parent_item.node {
hir::ItemImpl(.., ref impl_trait_ref, _, ref impl_item_refs) => {
for impl_item_ref in impl_item_refs {
let assoc_item =
self.associated_item_from_impl_item_ref(parent_def_id,
impl_trait_ref.is_some(),
impl_item_ref);
self.maps.associated_item.borrow_mut()
.insert(assoc_item.def_id, assoc_item);
}
}
hir::ItemTrait(.., ref trait_item_refs) => {
for trait_item_ref in trait_item_refs {
let assoc_item =
self.associated_item_from_trait_item_ref(parent_def_id, trait_item_ref);
self.maps.associated_item.borrow_mut()
.insert(assoc_item.def_id, assoc_item);
}
}
ref r => {
panic!("unexpected container of associated items: {:?}", r)
}
}
// memoize wants us to return something, so return
// the one we generated for this def-id
*self.maps.associated_item.borrow().get(&def_id).unwrap()
})
queries::associated_item::get(self, DUMMY_SP, def_id)
}
fn associated_item_from_trait_item_ref(self,
@@ -2623,3 +2575,47 @@ pub fn with_freevars<T, F>(self, fid: NodeId, f: F) -> T where
}
}
}
fn associated_item<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId)
-> AssociatedItem
{
let id = tcx.hir.as_local_node_id(def_id).unwrap();
let parent_id = tcx.hir.get_parent(id);
let parent_def_id = tcx.hir.local_def_id(parent_id);
let parent_item = tcx.hir.expect_item(parent_id);
match parent_item.node {
hir::ItemImpl(.., ref impl_trait_ref, _, ref impl_item_refs) => {
for impl_item_ref in impl_item_refs {
let assoc_item =
tcx.associated_item_from_impl_item_ref(parent_def_id,
impl_trait_ref.is_some(),
impl_item_ref);
if assoc_item.def_id == def_id {
return assoc_item;
}
}
}
hir::ItemTrait(.., ref trait_item_refs) => {
for trait_item_ref in trait_item_refs {
let assoc_item =
tcx.associated_item_from_trait_item_ref(parent_def_id, trait_item_ref);
if assoc_item.def_id == def_id {
return assoc_item;
}
}
}
ref r => {
panic!("unexpected container of associated items: {:?}", r)
}
}
panic!("associated item not found for def_id: {:?}", def_id);
}
pub fn provide(providers: &mut ty::maps::Providers) {
*providers = ty::maps::Providers {
associated_item,
..*providers
};
}
src/librustc_driver/driver.rs
+1
View File
@@ -882,6 +882,7 @@ macro_rules! try_with_f {
let mut local_providers = ty::maps::Providers::default();
mir::provide(&mut local_providers);
typeck::provide(&mut local_providers);
ty::provide(&mut local_providers);
let mut extern_providers = ty::maps::Providers::default();
cstore::provide(&mut extern_providers);