mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplify const_prop logic

Browse source
This commit is contained in:
Smitty 2021-06-15 17:57:54 -04:00
parent 524e575bb4
commit b40f3c1060
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
compiler/rustc_mir/src/transform/const_prop.rs
View file

@ -385,19 +385,17 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
(),
);
let ret = if let Ok(layout) = ecx.layout_of(body.return_ty().subst(tcx, substs)) {
let ret = ecx
.layout_of(body.return_ty().subst(tcx, substs))
.ok()
// Don't bother allocating memory for ZST types which have no values
// or for large values.
if !layout.is_zst() && layout.size < Size::from_bytes(MAX_ALLOC_LIMIT) {
// hopefully all types will allocate, since large types have already been removed,
// but check anyways
ecx.allocate(layout, MemoryKind::Stack).ok().map(Into::into)
} else {
None
}
} else {
None
};
.filter(|ret_layout| {
!ret_layout.is_zst() && ret_layout.size < Size::from_bytes(MAX_ALLOC_LIMIT)
})
// hopefully all types will allocate, since large types have already been removed
.and_then(|ret_layout| ecx.allocate(ret_layout, MemoryKind::Stack).ok())
.map(Into::into);
ecx.push_stack_frame(
Instance::new(def_id, substs),