mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #129179 - compiler-errors:cfi-erase-transparent, r=davidtwco

Browse Source 
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 #129169
Fixes #123685
This commit is contained in:
Matthias Krüger 2024-08-21 18:15:02 +02:00 committed by GitHub
commit 7da4b2d82a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_sanitizers/src/cfi/typeid/itanium_cxx_abi/transform.rs
View File

@ -146,7 +146,7 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for TransformTy<'tcx> {
!is_zst !is_zst
}); });
if let Some(field) = field { 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 // Generalize any repr(transparent) user-defined type that is either a
// pointer or reference, and either references itself or any other type that // pointer or reference, and either references itself or any other type that
// contains or references itself, to avoid a reference cycle. // contains or references itself, to avoid a reference cycle.

18
tests/ui/sanitizer/cfi/transparent-has-regions.rs Normal file
View File

@ -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)));
}