Skip to content

Commit

Permalink
Rollup merge of rust-lang#127882 - compiler-errors:cfi-sized-self-gat…
Browse files Browse the repository at this point in the history
…, r=oli-obk

Don't elaborate associated types with Sized bounds in `trait_object_ty` in cfi

The elaboration mechanism introduced in rust-lang#123005 didn't filter for associated types with `Self: Sized` bounds, which since rust-lang#112319 has excluded them from the object type.

Fixes rust-lang#127881
cc `@maurer` `@rcvalle`
  • Loading branch information
matthiaskrgr authored Jul 29, 2024
2 parents 4db3d12 + 29f5d8f commit 2e9d962
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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())
.in_definition_order()
.filter(|item| item.kind == ty::AssocKind::Type)
.filter(|item| !tcx.generics_require_sized_self(item.def_id))
.map(move |assoc_ty| {
super_poly_trait_ref.map_bound(|super_trait_ref| {
let alias_ty =
Expand Down
38 changes: 38 additions & 0 deletions tests/ui/sanitizer/cfi-sized-associated-ty.rs
Original file line number Diff line number Diff line change
@@ -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(&());
}

0 comments on commit 2e9d962

Please sign in to comment.