Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Elide superfluous storage markers #99946

Merged
merged 5 commits into from
Aug 25, 2022
Merged

Elide superfluous storage markers #99946

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
943a380
Elide storage markers when elaborating box derefs
tmiasko Jul 30, 2022
162bd16
Elide storage markers when elaborating deref projections
tmiasko Jul 30, 2022
625af2c
Elide storage markers for internal locals when inlining
tmiasko Jul 30, 2022
c2b74f9
Remove support for adding statement to all successors
tmiasko Jul 30, 2022
f8ca6aa
./x.py test --bless
tmiasko Aug 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove support for adding statement to all successors 
This feature of MIR patch system is no longer used.
  • Loading branch information
@tmiasko
tmiasko committed Aug 23, 2022
commit c2b74f9cc71d0d53a1f7c34070bde1df4bb31dfb
17 changes: 0 additions & 17 deletions compiler/rustc_middle/src/mir/patch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ impl<'tcx> MirPatch<'tcx> {

let mut delta = 0;
let mut last_bb = START_BLOCK;
let mut stmts_and_targets: Vec<(Statement<'_>, BasicBlock)> = Vec::new();
for (mut loc, stmt) in new_statements {
if loc.block != last_bb {
delta = 0;
Expand All @@ -159,27 +158,11 @@ impl<'tcx> MirPatch<'tcx> {
debug!("MirPatch: adding statement {:?} at loc {:?}+{}", stmt, loc, delta);
loc.statement_index += delta;
let source_info = Self::source_info_for_index(&body[loc.block], loc);

// For mir-opt `Derefer` to work in all cases we need to
// get terminator's targets and apply the statement to all of them.
if loc.statement_index > body[loc.block].statements.len() {
let term = body[loc.block].terminator();
for i in term.successors() {
stmts_and_targets.push((Statement { source_info, kind: stmt.clone() }, i));
}
delta += 1;
continue;
}

body[loc.block]
.statements
.insert(loc.statement_index, Statement { source_info, kind: stmt });
delta += 1;
}

for (stmt, target) in stmts_and_targets.into_iter().rev() {
body[target].statements.insert(0, stmt);
}
}

pub fn source_info_for_index(data: &BasicBlockData<'_>, loc: Location) -> SourceInfo {
Expand Down