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

Auto merge of #117801 - tmiasko:remove-zsts-fuel, r=cjgillot

Browse Source 
Remove incorrect transformation from RemoveZsts

Partial removal of storage statements for a local is incorrect, so a decision to optimize cannot be make independently for each statement.

Avoid the issue by performing the transformation completely or not at all.
This commit is contained in:
bors 2023-11-14 04:22:56 +00:00
commit 5777f2c6bd
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/rustc_mir_transform/src/remove_zsts.rs
View File

@ -17,6 +17,11 @@ impl<'tcx> MirPass<'tcx> for RemoveZsts {
if tcx.type_of(body.source.def_id()).instantiate_identity().is_coroutine() { if tcx.type_of(body.source.def_id()).instantiate_identity().is_coroutine() {
return; return;
} }
if !tcx.consider_optimizing(|| format!("RemoveZsts - {:?}", body.source.def_id())) {
return;
}
let param_env = tcx.param_env_reveal_all_normalized(body.source.def_id()); let param_env = tcx.param_env_reveal_all_normalized(body.source.def_id());
let local_decls = &body.local_decls; let local_decls = &body.local_decls;
let mut replacer = Replacer { tcx, param_env, local_decls }; let mut replacer = Replacer { tcx, param_env, local_decls };
@ -125,12 +130,6 @@ impl<'tcx> MutVisitor<'tcx> for Replacer<'_, 'tcx> {
if let Some(place_for_ty) = place_for_ty if let Some(place_for_ty) = place_for_ty
&& let ty = place_for_ty.ty(self.local_decls, self.tcx).ty && let ty = place_for_ty.ty(self.local_decls, self.tcx).ty
&& self.known_to_be_zst(ty) && self.known_to_be_zst(ty)
&& self.tcx.consider_optimizing(|| {
format!(
"RemoveZsts - Place: {:?} SourceInfo: {:?}",
place_for_ty, statement.source_info
)
})
{ {
statement.make_nop(); statement.make_nop();
} else { } else {