bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make sure to detect trait upcasting coercion even after normalization

Browse source
This commit is contained in:
Michael Goulet 2023-07-16 22:11:03 +00:00
parent 7e66c0b7ed
commit 24eefd08e2
4 changed files with 20 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_trait_selection/src/solve/eval_ctxt/select.rs
View file

@ -315,7 +315,13 @@ fn rematch_object<'tcx>(
// If we're upcasting, get the offset of the vtable pointer, otherwise get
// the base of the vtable.
Ok(Some(if is_upcasting {
ImplSource::TraitUpcasting(ImplSourceTraitUpcastingData { vtable_vptr_slot, nested })
// If source and target trait def ids are identical,
// then we are simply removing auto traits.
if source_trait_ref.def_id() == target_trait_ref.def_id() {
ImplSource::Builtin(nested)
} else {
ImplSource::TraitUpcasting(ImplSourceTraitUpcastingData { vtable_vptr_slot, nested })
}
} else {
ImplSource::Object(ImplSourceObjectData { vtable_base, nested })
}))