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

Mark entire local as promoted even if only part is used

Browse Source
This commit is contained in:
Dylan MacKenzie 2019-10-23 09:46:52 -07:00
parent f39205b5d9
commit fab0caf172
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/librustc_mir/transform/qualify_consts.rs
View File

@ -1067,30 +1067,28 @@ impl<'a, 'tcx> Checker<'a, 'tcx> {
};
debug!("qualify_const: promotion_candidates={:?}", promotion_candidates);
for candidate in promotion_candidates {
match candidate {
let promoted_place = match candidate {
Candidate::Repeat(Location { block: bb, statement_index: stmt_idx }) => {
if let StatementKind::Assign(box(_, Rvalue::Repeat(
Operand::Move(place),
_
))) = &self.body[bb].statements[stmt_idx].kind {
if let Some(index) = place.as_local() {
promoted_temps.insert(index);
}
match &self.body[bb].statements[stmt_idx].kind {
StatementKind::Assign(box(_, Rvalue::Repeat(Operand::Move(place), _)))
=> place,
_ => continue,
}
}
Candidate::Ref(Location { block: bb, statement_index: stmt_idx }) => {
if let StatementKind::Assign(
box(
_,
Rvalue::Ref(_, _, place)
)
) = &self.body[bb].statements[stmt_idx].kind {
if let Some(index) = place.as_local() {
promoted_temps.insert(index);
}
match &self.body[bb].statements[stmt_idx].kind {
StatementKind::Assign(box( _, Rvalue::Ref(_, _, place))) => place,
_ => continue,
}
}
Candidate::Argument { .. } => {}
Candidate::Argument { .. } => continue,
};
match promoted_place.base {
PlaceBase::Local(local) if !promoted_place.is_indirect() => {
promoted_temps.insert(local);
}
_ => {}
}
}