Rollup merge of #127882 - compiler-errors:cfi-sized-self-gat, r=oli-obk
Don't elaborate associated types with Sized bounds in `trait_object_ty` in cfi The elaboration mechanism introduced in #123005 didn't filter for associated types with `Self: Sized` bounds, which since #112319 has excluded them from the object type. Fixes #127881 cc `@maurer` `@rcvalle`
This commit is contained in:
commit
2e9d962a8b
@ -232,6 +232,7 @@ fn trait_object_ty<'tcx>(tcx: TyCtxt<'tcx>, poly_trait_ref: ty::PolyTraitRef<'tc
|
|||||||
tcx.associated_items(super_poly_trait_ref.def_id())
|
tcx.associated_items(super_poly_trait_ref.def_id())
|
||||||
.in_definition_order()
|
.in_definition_order()
|
||||||
.filter(|item| item.kind == ty::AssocKind::Type)
|
.filter(|item| item.kind == ty::AssocKind::Type)
|
||||||
|
.filter(|item| !tcx.generics_require_sized_self(item.def_id))
|
||||||
.map(move |assoc_ty| {
|
.map(move |assoc_ty| {
|
||||||
super_poly_trait_ref.map_bound(|super_trait_ref| {
|
super_poly_trait_ref.map_bound(|super_trait_ref| {
|
||||||
let alias_ty =
|
let alias_ty =
|
||||||
|
38
tests/ui/sanitizer/cfi-sized-associated-ty.rs
Normal file
38
tests/ui/sanitizer/cfi-sized-associated-ty.rs
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
// Check that we only elaborate non-`Self: Sized` associated types when
|
||||||
|
// erasing the receiver from trait ref.
|
||||||
|
|
||||||
|
//@ revisions: cfi kcfi
|
||||||
|
// FIXME(#122848) Remove only-linux once OSX CFI binaries work
|
||||||
|
//@ only-linux
|
||||||
|
//@ [cfi] needs-sanitizer-cfi
|
||||||
|
//@ [kcfi] needs-sanitizer-kcfi
|
||||||
|
//@ compile-flags: -C target-feature=-crt-static
|
||||||
|
//@ [cfi] compile-flags: -C codegen-units=1 -C lto -C prefer-dynamic=off -C opt-level=0
|
||||||
|
//@ [cfi] compile-flags: -Z sanitizer=cfi
|
||||||
|
//@ [kcfi] compile-flags: -Z sanitizer=kcfi
|
||||||
|
//@ [kcfi] compile-flags: -C panic=abort -C prefer-dynamic=off
|
||||||
|
//@ run-pass
|
||||||
|
|
||||||
|
trait Foo {
|
||||||
|
type Bar<'a>
|
||||||
|
where
|
||||||
|
Self: Sized;
|
||||||
|
|
||||||
|
fn test(&self);
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Foo for () {
|
||||||
|
type Bar<'a> = ()
|
||||||
|
where
|
||||||
|
Self: Sized;
|
||||||
|
|
||||||
|
fn test(&self) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn test(x: &dyn Foo) {
|
||||||
|
x.test();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
test(&());
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user