Skip to content

Commit

Permalink
Unrolled build for rust-lang#129179
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#129179 - compiler-errors:cfi-erase-transparent, r=davidtwco

CFI: Erase regions when projecting ADT to its transparent non-1zst field

The output from `FieldDef::ty` (or `TyCtxt::type_of`) may have free regions (well, `'static`) -- erase it.

Fixes rust-lang#129169
Fixes rust-lang#123685
  • Loading branch information
rust-timer committed Aug 21, 2024
2 parents 982c6f8 + c8ae02f commit 76be8b7
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for TransformTy<'tcx> {
!is_zst
});
if let Some(field) = field {
let ty0 = self.tcx.type_of(field.did).instantiate(self.tcx, args);
let ty0 = self.tcx.erase_regions(field.ty(self.tcx, args));
// Generalize any repr(transparent) user-defined type that is either a
// pointer or reference, and either references itself or any other type that
// contains or references itself, to avoid a reference cycle.
Expand Down
18 changes: 18 additions & 0 deletions tests/ui/sanitizer/cfi/transparent-has-regions.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//@ needs-sanitizer-cfi
//@ compile-flags: -Ccodegen-units=1 -Clto -Ctarget-feature=-crt-static -Zsanitizer=cfi
//@ no-prefer-dynamic
//@ only-x86_64-unknown-linux-gnu
//@ build-pass

pub trait Trait {}

impl Trait for i32 {}

#[repr(transparent)]
struct BoxedTrait(Box<dyn Trait + 'static>);

fn hello(x: BoxedTrait) {}

fn main() {
hello(BoxedTrait(Box::new(1)));
}

0 comments on commit 76be8b7

Please sign in to comment.