bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #89619 - michaelwoerister:incr-vtables, r=nagisa

Browse source 
Turn vtable_allocation() into a query

This PR removes the untracked vtable-const-allocation cache from the `tcx` and turns the `vtable_allocation()` method into a query.

The change is pretty straightforward and should be backportable without too much effort.

Fixes https://github.com/rust-lang/rust/issues/89598.
This commit is contained in:
bors 2021-10-08 09:04:06 +00:00
commit 44995f7afb
10 changed files with 128 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_middle/src/query/mod.rs
View file

@ -1012,6 +1012,13 @@ rustc_queries! {
key.1, key.0 }
}
query vtable_allocation(key: (Ty<'tcx>, Option<ty::PolyExistentialTraitRef<'tcx>>)) -> mir::interpret::AllocId {
desc { |tcx| "vtable const allocation for <{} as {}>",
key.0,
key.1.map(|trait_ref| format!("{}", trait_ref)).unwrap_or("_".to_owned())
}
}
query codegen_fulfill_obligation(
key: (ty::ParamEnv<'tcx>, ty::PolyTraitRef<'tcx>)
) -> Result<ImplSource<'tcx, ()>, ErrorReported> {