nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-09 08:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add expanded type cache to OpaqueTypeExpander

Browse Source
This commit is contained in:
Tyler Mandry 2019-10-10 16:38:05 -07:00
parent 58b54911fa
commit fe09bb518d
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/librustc/ty/util.rs
View File

@ -697,6 +697,9 @@ impl<'tcx> TyCtxt<'tcx> {
// that type, and when we finish expanding that type we remove the // that type, and when we finish expanding that type we remove the
// its DefId. // its DefId.
seen_opaque_tys: FxHashSet<DefId>, seen_opaque_tys: FxHashSet<DefId>,
// Cache of all expansions we've seen so far. This is a critical
// optimization for some large types produced by async fn trees.
expanded_cache: FxHashMap<(DefId, SubstsRef<'tcx>), Ty<'tcx>>,
primary_def_id: DefId, primary_def_id: DefId,
found_recursion: bool, found_recursion: bool,
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
@ -713,9 +716,16 @@ impl<'tcx> TyCtxt<'tcx> {
} }
let substs = substs.fold_with(self); let substs = substs.fold_with(self);
if self.seen_opaque_tys.insert(def_id) { if self.seen_opaque_tys.insert(def_id) {
let generic_ty = self.tcx.type_of(def_id); let expanded_ty = match self.expanded_cache.get(&(def_id, substs)) {
let concrete_ty = generic_ty.subst(self.tcx, substs); Some(expanded_ty) => expanded_ty,
let expanded_ty = self.fold_ty(concrete_ty); None => {
let generic_ty = self.tcx.type_of(def_id);
let concrete_ty = generic_ty.subst(self.tcx, substs);
let expanded_ty = self.fold_ty(concrete_ty);
self.expanded_cache.insert((def_id, substs), expanded_ty);
expanded_ty
}
};
self.seen_opaque_tys.remove(&def_id); self.seen_opaque_tys.remove(&def_id);
Some(expanded_ty) Some(expanded_ty)
} else { } else {
@ -743,6 +753,7 @@ impl<'tcx> TyCtxt<'tcx> {
let mut visitor = OpaqueTypeExpander { let mut visitor = OpaqueTypeExpander {
seen_opaque_tys: FxHashSet::default(), seen_opaque_tys: FxHashSet::default(),
expanded_cache: FxHashMap::default(),
primary_def_id: def_id, primary_def_id: def_id,
found_recursion: false, found_recursion: false,
tcx: self, tcx: self,