Stop SRoA'ing DynMetadata in MIR

This commit is contained in:
Scott McMurray 2024-05-24 00:40:39 -07:00
parent 213ad10c8f
commit d7248d7b71
2 changed files with 24 additions and 0 deletions

View File

@ -70,6 +70,11 @@ fn escaping_locals<'tcx>(
// Exclude #[repr(simd)] types so that they are not de-optimized into an array // Exclude #[repr(simd)] types so that they are not de-optimized into an array
return true; return true;
} }
if Some(def.did()) == tcx.lang_items().dyn_metadata() {
// codegen wants to see the `DynMetadata<T>`,
// not the inner reference-to-opaque-type.
return true;
}
// We already excluded unions and enums, so this ADT must have one variant // We already excluded unions and enums, so this ADT must have one variant
let variant = def.variant(FIRST_VARIANT); let variant = def.variant(FIRST_VARIANT);
if variant.fields.len() > 1 { if variant.fields.len() > 1 {

View File

@ -0,0 +1,19 @@
//@ run-pass
//@ compile-flags: -Zmir-opt-level=5 -Zvalidate-mir
#![feature(ptr_metadata)]
// Regression for <https://github.com/rust-lang/rust/issues/125506>,
// which failed because of SRoA would project into `DynMetadata`.
trait Foo {}
struct Bar;
impl Foo for Bar {}
fn main() {
let a: *mut dyn Foo = &mut Bar;
let _d = a.to_raw_parts().0 as usize;
}