nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-11 01:17:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename DropTreeBuilder::add_entry to link_entry_point

Browse Source
This commit is contained in:
Zalathar 2024-03-06 21:13:43 +11:00
parent 80399064af
commit 30fa6a8b50
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_mir_build/src/build/scope.rs
View File

@ -247,7 +247,7 @@ trait DropTreeBuilder<'tcx> {
/// Links a block outside the drop tree, `from`, to the block `to` inside /// Links a block outside the drop tree, `from`, to the block `to` inside
/// the drop tree. /// the drop tree.
fn add_entry(cfg: &mut CFG<'tcx>, from: BasicBlock, to: BasicBlock); fn link_entry_point(cfg: &mut CFG<'tcx>, from: BasicBlock, to: BasicBlock);
} }
impl DropTree { impl DropTree {
@ -332,7 +332,7 @@ impl DropTree {
needs_block[drop_idx] = Block::Own; needs_block[drop_idx] = Block::Own;
while entry_points.last().is_some_and(|entry_point| entry_point.0 == drop_idx) { while entry_points.last().is_some_and(|entry_point| entry_point.0 == drop_idx) {
let entry_block = entry_points.pop().unwrap().1; let entry_block = entry_points.pop().unwrap().1;
T::add_entry(cfg, entry_block, block); T::link_entry_point(cfg, entry_block, block);
} }
} }
match needs_block[drop_idx] { match needs_block[drop_idx] {
@ -1439,7 +1439,7 @@ impl<'tcx> DropTreeBuilder<'tcx> for ExitScopes {
fn make_block(cfg: &mut CFG<'tcx>) -> BasicBlock { fn make_block(cfg: &mut CFG<'tcx>) -> BasicBlock {
cfg.start_new_block() cfg.start_new_block()
} }
fn add_entry(cfg: &mut CFG<'tcx>, from: BasicBlock, to: BasicBlock) { fn link_entry_point(cfg: &mut CFG<'tcx>, from: BasicBlock, to: BasicBlock) {
cfg.block_data_mut(from).terminator_mut().kind = TerminatorKind::Goto { target: to }; cfg.block_data_mut(from).terminator_mut().kind = TerminatorKind::Goto { target: to };
} }
} }
@ -1450,7 +1450,7 @@ impl<'tcx> DropTreeBuilder<'tcx> for CoroutineDrop {
fn make_block(cfg: &mut CFG<'tcx>) -> BasicBlock { fn make_block(cfg: &mut CFG<'tcx>) -> BasicBlock {
cfg.start_new_block() cfg.start_new_block()
} }
fn add_entry(cfg: &mut CFG<'tcx>, from: BasicBlock, to: BasicBlock) { fn link_entry_point(cfg: &mut CFG<'tcx>, from: BasicBlock, to: BasicBlock) {
let term = cfg.block_data_mut(from).terminator_mut(); let term = cfg.block_data_mut(from).terminator_mut();
if let TerminatorKind::Yield { ref mut drop, .. } = term.kind { if let TerminatorKind::Yield { ref mut drop, .. } = term.kind {
*drop = Some(to); *drop = Some(to);
@ -1470,7 +1470,7 @@ impl<'tcx> DropTreeBuilder<'tcx> for Unwind {
fn make_block(cfg: &mut CFG<'tcx>) -> BasicBlock { fn make_block(cfg: &mut CFG<'tcx>) -> BasicBlock {
cfg.start_new_cleanup_block() cfg.start_new_cleanup_block()
} }
fn add_entry(cfg: &mut CFG<'tcx>, from: BasicBlock, to: BasicBlock) { fn link_entry_point(cfg: &mut CFG<'tcx>, from: BasicBlock, to: BasicBlock) {
let term = &mut cfg.block_data_mut(from).terminator_mut(); let term = &mut cfg.block_data_mut(from).terminator_mut();
match &mut term.kind { match &mut term.kind {
TerminatorKind::Drop { unwind, .. } => { TerminatorKind::Drop { unwind, .. } => {