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

Do not intern too large aggregates.

Browse Source
This commit is contained in:
Camille GILLOT 2023-09-23 14:55:28 +00:00
parent 38c86b0798
commit db9bd9bd8c
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
compiler/rustc_mir_transform/src/gvn.rs
View File

@ -291,24 +291,30 @@ fn eval_to_const(&mut self, value: VnIndex) -> Option<OpTy<'tcx>> {
.collect::<Option<Vec<_>>>()?;
let variant = if ty.is_enum() { Some(variant) } else { None };
let ty = self.ecx.layout_of(ty).ok()?;
let alloc_id = self
.ecx
.intern_with_temp_alloc(ty, |ecx, dest| {
let variant_dest = if let Some(variant) = variant {
ecx.project_downcast(dest, variant)?
} else {
dest.clone()
};
for (field_index, op) in fields.into_iter().enumerate() {
let field_dest = ecx.project_field(&variant_dest, field_index)?;
ecx.copy_op(op, &field_dest, /*allow_transmute*/ false)?;
}
ecx.write_discriminant(variant.unwrap_or(FIRST_VARIANT), dest)
})
.ok()?;
let mplace =
self.ecx.raw_const_to_mplace(ConstAlloc { alloc_id, ty: ty.ty }).ok()?;
mplace.into()
if ty.is_zst() {
ImmTy::uninit(ty).into()
} else if matches!(ty.abi, Abi::Scalar(..) | Abi::ScalarPair(..)) {
let alloc_id = self
.ecx
.intern_with_temp_alloc(ty, |ecx, dest| {
let variant_dest = if let Some(variant) = variant {
ecx.project_downcast(dest, variant)?
} else {
dest.clone()
};
for (field_index, op) in fields.into_iter().enumerate() {
let field_dest = ecx.project_field(&variant_dest, field_index)?;
ecx.copy_op(op, &field_dest, /*allow_transmute*/ false)?;
}
ecx.write_discriminant(variant.unwrap_or(FIRST_VARIANT), dest)
})
.ok()?;
let mplace =
self.ecx.raw_const_to_mplace(ConstAlloc { alloc_id, ty: ty.ty }).ok()?;
mplace.into()
} else {
return None;
}
}
Projection(base, elem) => {