bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Erase regions within vtable_trait_first_method_offset.

Browse source
This commit is contained in:
Charles Lew 2021-11-03 23:37:50 +08:00
parent 473eaa42e9
commit 8841204cc6
2 changed files with 36 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_trait_selection/src/traits/mod.rs
View file

@ -748,6 +748,9 @@ fn vtable_trait_first_method_offset<'tcx>(
) -> usize {
let (trait_to_be_found, trait_owning_vtable) = key;
// #90177
let trait_to_be_found_erased = tcx.erase_regions(trait_to_be_found);
let vtable_segment_callback = {
let mut vtable_base = 0;
@ -757,7 +760,7 @@ fn vtable_trait_first_method_offset<'tcx>(
vtable_base += COMMON_VTABLE_ENTRIES.len();
}
VtblSegment::TraitOwnEntries { trait_ref, emit_vptr } => {
if trait_ref == trait_to_be_found {
if tcx.erase_regions(trait_ref) == trait_to_be_found_erased {
return ControlFlow::Break(vtable_base);
}
vtable_base += util::count_own_vtable_entries(tcx, trait_ref);