diff options
| author | bors <bors@rust-lang.org> | 2024-06-16 05:33:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-16 05:33:49 +0000 |
| commit | 5639c21fb38d26a72420fe627be25d4f6dfc1f3b (patch) | |
| tree | 33e2ca0475e235b516018f49f76b1f50fbe12c5f /compiler/rustc_middle/src/query/keys.rs | |
| parent | cd0c944b0750db887291bc25f20a05f8f31a8195 (diff) | |
| parent | 3b9adbec32757264ba30b68e04ce66d6023810aa (diff) | |
| download | rust-5639c21fb38d26a72420fe627be25d4f6dfc1f3b.tar.gz rust-5639c21fb38d26a72420fe627be25d4f6dfc1f3b.zip | |
Auto merge of #126505 - compiler-errors:no-vtable, r=lcnr
Only compute vtable information during codegen This PR removes vtable information from the `Object` and `TraitUpcasting` candidate sources in the trait solvers, and defers the computation of relevant information to `Instance::resolve`. This is because vtables really aren't a thing in the trait world -- they're an implementation detail in codegen. Previously it was just easiest to tangle this information together since we were already doing the work of looking at all the supertraits in the trait solver, and specifically because we use traits to represent when it's possible to call a method via a vtable (`Object` candidate) and do upcasting (`Unsize` candidate). but I am somewhat suspicious we're doing a *lot* of extra work, especially in polymorphic contexts, so let's see what perf says.
Diffstat (limited to 'compiler/rustc_middle/src/query/keys.rs')
| -rw-r--r-- | compiler/rustc_middle/src/query/keys.rs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/compiler/rustc_middle/src/query/keys.rs b/compiler/rustc_middle/src/query/keys.rs index faa137019cb..5452e1dff3e 100644 --- a/compiler/rustc_middle/src/query/keys.rs +++ b/compiler/rustc_middle/src/query/keys.rs @@ -360,6 +360,14 @@ impl<'tcx> Key for (ty::ParamEnv<'tcx>, ty::TraitRef<'tcx>) { } } +impl<'tcx> Key for ty::TraitRef<'tcx> { + type Cache<V> = DefaultCache<Self, V>; + + fn default_span(&self, tcx: TyCtxt<'_>) -> Span { + tcx.def_span(self.def_id) + } +} + impl<'tcx> Key for ty::PolyTraitRef<'tcx> { type Cache<V> = DefaultCache<Self, V>; |
