Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 388f6a6

Browse files
cjgillotcjgillot
committed
Make TerminatorEdge plural.
1 parent 6cf15d4 commit 388f6a6

File tree

12 files changed

+59
-59
lines changed

12 files changed

+59
-59
lines changed

‎compiler/rustc_borrowck/src/dataflow.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use rustc_data_structures::fx::FxIndexMap;
44
use rustc_index::bit_set::BitSet;
55
use rustc_middle::mir::{
6-
self, BasicBlock, Body, CallReturnPlaces, Location, Place, TerminatorEdge,
6+
self, BasicBlock, Body, CallReturnPlaces, Location, Place, TerminatorEdges,
77
};
88
use rustc_middle::ty::RegionVid;
99
use rustc_middle::ty::TyCtxt;
@@ -411,7 +411,7 @@ impl<'tcx> rustc_mir_dataflow::GenKillAnalysis<'tcx> for Borrows<'_, 'tcx> {
411411
trans: &mut Self::Domain,
412412
terminator: &'mir mir::Terminator<'tcx>,
413413
_location: Location,
414-
) -> TerminatorEdge<'mir, 'tcx> {
414+
) -> TerminatorEdges<'mir, 'tcx> {
415415
if let mir::TerminatorKind::InlineAsm { operands, .. } = &terminator.kind {
416416
for op in operands {
417417
if let mir::InlineAsmOperand::Out { place: Some(place), .. }

‎compiler/rustc_const_eval/src/transform/check_consts/resolver.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use rustc_index::bit_set::BitSet;
66
use rustc_middle::mir::visit::Visitor;
77
use rustc_middle::mir::{
8-
self, BasicBlock, CallReturnPlaces, Local, Location, Statement, StatementKind, TerminatorEdge,
8+
self, BasicBlock, CallReturnPlaces, Local, Location, Statement, StatementKind, TerminatorEdges,
99
};
1010
use rustc_mir_dataflow::fmt::DebugWithContext;
1111
use rustc_mir_dataflow::JoinSemiLattice;
@@ -352,7 +352,7 @@ where
352352
state: &mut Self::Domain,
353353
terminator: &'mir mir::Terminator<'tcx>,
354354
location: Location,
355-
) -> TerminatorEdge<'mir, 'tcx> {
355+
) -> TerminatorEdges<'mir, 'tcx> {
356356
self.transfer_function(state).visit_terminator(terminator, location);
357357
terminator.edges()
358358
}

‎compiler/rustc_middle/src/mir/terminator.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ impl<'tcx> TerminatorKind<'tcx> {
433433
}
434434

435435
#[derive(Copy, Clone, Debug)]
436-
pub enum TerminatorEdge<'mir, 'tcx> {
436+
pub enum TerminatorEdges<'mir, 'tcx> {
437437
/// For terminators that have no successor, like `return`.
438438
None,
439439
/// For terminators that a single successor, like `goto`, and `assert` without cleanup block.
@@ -451,7 +451,7 @@ pub enum TerminatorEdge<'mir, 'tcx> {
451451
}
452452

453453
/// List of places that are written to after a successful (non-unwind) return
454-
/// from a `Call` or `InlineAsm`.
454+
/// from a `Call`, `Yield` or `InlineAsm`.
455455
#[derive(Copy, Clone, Debug)]
456456
pub enum CallReturnPlaces<'a, 'tcx> {
457457
Call(Place<'tcx>),
@@ -477,42 +477,42 @@ impl<'tcx> CallReturnPlaces<'_, 'tcx> {
477477
}
478478

479479
impl<'tcx> Terminator<'tcx> {
480-
pub fn edges(&self) -> TerminatorEdge<'_, 'tcx> {
480+
pub fn edges(&self) -> TerminatorEdges<'_, 'tcx> {
481481
self.kind.edges()
482482
}
483483
}
484484

485485
impl<'tcx> TerminatorKind<'tcx> {
486-
pub fn edges(&self) -> TerminatorEdge<'_, 'tcx> {
486+
pub fn edges(&self) -> TerminatorEdges<'_, 'tcx> {
487487
use TerminatorKind::*;
488488
match *self {
489-
Return | Resume | Terminate | GeneratorDrop | Unreachable => TerminatorEdge::None,
489+
Return | Resume | Terminate | GeneratorDrop | Unreachable => TerminatorEdges::None,
490490

491-
Goto { target } => TerminatorEdge::Single(target),
491+
Goto { target } => TerminatorEdges::Single(target),
492492

493493
Assert { target, unwind, expected: _, msg: _, cond: _ }
494494
| Drop { target, unwind, place: _, replace: _ }
495495
| FalseUnwind { real_target: target, unwind } => match unwind {
496-
UnwindAction::Cleanup(unwind) => TerminatorEdge::Double(target, unwind),
496+
UnwindAction::Cleanup(unwind) => TerminatorEdges::Double(target, unwind),
497497
UnwindAction::Continue | UnwindAction::Terminate | UnwindAction::Unreachable => {
498-
TerminatorEdge::Single(target)
498+
TerminatorEdges::Single(target)
499499
}
500500
},
501501

502502
FalseEdge { real_target, imaginary_target } => {
503-
TerminatorEdge::Double(real_target, imaginary_target)
503+
TerminatorEdges::Double(real_target, imaginary_target)
504504
}
505505

506506
Yield { resume: target, drop, resume_arg, value: _ } => {
507-
TerminatorEdge::AssignOnReturn {
507+
TerminatorEdges::AssignOnReturn {
508508
return_: Some(target),
509509
unwind: drop.map_or(UnwindAction::Terminate, UnwindAction::Cleanup),
510510
place: CallReturnPlaces::Yield(resume_arg),
511511
}
512512
}
513513

514514
Call { unwind, destination, target, func: _, args: _, fn_span: _, call_source: _ } => {
515-
TerminatorEdge::AssignOnReturn {
515+
TerminatorEdges::AssignOnReturn {
516516
return_: target,
517517
unwind,
518518
place: CallReturnPlaces::Call(destination),
@@ -526,13 +526,13 @@ impl<'tcx> TerminatorKind<'tcx> {
526526
line_spans: _,
527527
destination,
528528
unwind,
529-
} => TerminatorEdge::AssignOnReturn {
529+
} => TerminatorEdges::AssignOnReturn {
530530
return_: destination,
531531
unwind,
532532
place: CallReturnPlaces::InlineAsm(operands),
533533
},
534534

535-
SwitchInt { ref targets, ref discr } => TerminatorEdge::SwitchInt { targets, discr },
535+
SwitchInt { ref targets, ref discr } => TerminatorEdges::SwitchInt { targets, discr },
536536
}
537537
}
538538
}

‎compiler/rustc_mir_dataflow/src/framework/direction.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use rustc_middle::mir::{
2-
self, BasicBlock, CallReturnPlaces, Location, SwitchTargets, TerminatorEdge, UnwindAction,
2+
self, BasicBlock, CallReturnPlaces, Location, SwitchTargets, TerminatorEdges, UnwindAction,
33
};
44
use std::ops::RangeInclusive;
55

@@ -29,7 +29,7 @@ pub trait Direction {
2929
block: BasicBlock,
3030
block_data: &'mir mir::BasicBlockData<'tcx>,
3131
statement_effect: Option<&dyn Fn(BasicBlock, &mut A::Domain)>,
32-
) -> TerminatorEdge<'mir, 'tcx>
32+
) -> TerminatorEdges<'mir, 'tcx>
3333
where
3434
A: Analysis<'tcx>;
3535

@@ -55,7 +55,7 @@ pub trait Direction {
5555
body: &mir::Body<'tcx>,
5656
exit_state: &mut A::Domain,
5757
block: BasicBlock,
58-
edges: TerminatorEdge<'_, 'tcx>,
58+
edges: TerminatorEdges<'_, 'tcx>,
5959
propagate: impl FnMut(BasicBlock, &A::Domain),
6060
) where
6161
A: Analysis<'tcx>;
@@ -73,7 +73,7 @@ impl Direction for Backward {
7373
block: BasicBlock,
7474
block_data: &'mir mir::BasicBlockData<'tcx>,
7575
statement_effect: Option<&dyn Fn(BasicBlock, &mut A::Domain)>,
76-
) -> TerminatorEdge<'mir, 'tcx>
76+
) -> TerminatorEdges<'mir, 'tcx>
7777
where
7878
A: Analysis<'tcx>,
7979
{
@@ -222,7 +222,7 @@ impl Direction for Backward {
222222
body: &mir::Body<'tcx>,
223223
exit_state: &mut A::Domain,
224224
bb: BasicBlock,
225-
_edges: TerminatorEdge<'_, 'tcx>,
225+
_edges: TerminatorEdges<'_, 'tcx>,
226226
mut propagate: impl FnMut(BasicBlock, &A::Domain),
227227
) where
228228
A: Analysis<'tcx>,
@@ -330,7 +330,7 @@ impl Direction for Forward {
330330
block: BasicBlock,
331331
block_data: &'mir mir::BasicBlockData<'tcx>,
332332
statement_effect: Option<&dyn Fn(BasicBlock, &mut A::Domain)>,
333-
) -> TerminatorEdge<'mir, 'tcx>
333+
) -> TerminatorEdges<'mir, 'tcx>
334334
where
335335
A: Analysis<'tcx>,
336336
{
@@ -474,19 +474,19 @@ impl Direction for Forward {
474474
_body: &mir::Body<'tcx>,
475475
exit_state: &mut A::Domain,
476476
bb: BasicBlock,
477-
edges: TerminatorEdge<'_, 'tcx>,
477+
edges: TerminatorEdges<'_, 'tcx>,
478478
mut propagate: impl FnMut(BasicBlock, &A::Domain),
479479
) where
480480
A: Analysis<'tcx>,
481481
{
482482
match edges {
483-
TerminatorEdge::None => {}
484-
TerminatorEdge::Single(target) => propagate(target, exit_state),
485-
TerminatorEdge::Double(target, unwind) => {
483+
TerminatorEdges::None => {}
484+
TerminatorEdges::Single(target) => propagate(target, exit_state),
485+
TerminatorEdges::Double(target, unwind) => {
486486
propagate(target, exit_state);
487487
propagate(unwind, exit_state);
488488
}
489-
TerminatorEdge::AssignOnReturn { return_, unwind, place } => {
489+
TerminatorEdges::AssignOnReturn { return_, unwind, place } => {
490490
// This must be done *first*, otherwise the unwind path will see the assignments.
491491
if let UnwindAction::Cleanup(unwind) = unwind {
492492
propagate(unwind, exit_state);
@@ -496,7 +496,7 @@ impl Direction for Forward {
496496
propagate(return_, exit_state);
497497
}
498498
}
499-
TerminatorEdge::SwitchInt { targets, discr } => {
499+
TerminatorEdges::SwitchInt { targets, discr } => {
500500
let mut applier = ForwardSwitchIntEdgeEffectsApplier {
501501
exit_state,
502502
targets,

‎compiler/rustc_mir_dataflow/src/framework/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use std::cmp::Ordering;
3434

3535
use rustc_index::bit_set::{BitSet, ChunkedBitSet, HybridBitSet};
3636
use rustc_index::Idx;
37-
use rustc_middle::mir::{self, BasicBlock, CallReturnPlaces, Location, TerminatorEdge};
37+
use rustc_middle::mir::{self, BasicBlock, CallReturnPlaces, Location, TerminatorEdges};
3838
use rustc_middle::ty::TyCtxt;
3939

4040
mod cursor;
@@ -168,7 +168,7 @@ pub trait Analysis<'tcx>: AnalysisDomain<'tcx> {
168168
state: &mut Self::Domain,
169169
terminator: &'mir mir::Terminator<'tcx>,
170170
location: Location,
171-
) -> TerminatorEdge<'mir, 'tcx>;
171+
) -> TerminatorEdges<'mir, 'tcx>;
172172

173173
/// Updates the current dataflow state with an effect that occurs immediately *before* the
174174
/// given terminator.
@@ -297,7 +297,7 @@ pub trait GenKillAnalysis<'tcx>: Analysis<'tcx> {
297297
trans: &mut Self::Domain,
298298
terminator: &'mir mir::Terminator<'tcx>,
299299
location: Location,
300-
) -> TerminatorEdge<'mir, 'tcx>;
300+
) -> TerminatorEdges<'mir, 'tcx>;
301301

302302
/// See `Analysis::apply_before_terminator_effect`.
303303
fn before_terminator_effect(
@@ -356,7 +356,7 @@ where
356356
state: &mut A::Domain,
357357
terminator: &'mir mir::Terminator<'tcx>,
358358
location: Location,
359-
) -> TerminatorEdge<'mir, 'tcx> {
359+
) -> TerminatorEdges<'mir, 'tcx> {
360360
self.terminator_effect(state, terminator, location)
361361
}
362362

‎compiler/rustc_mir_dataflow/src/framework/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ impl<'tcx, D: Direction> Analysis<'tcx> for MockAnalysis<'tcx, D> {
203203
state: &mut Self::Domain,
204204
terminator: &'mir mir::Terminator<'tcx>,
205205
location: Location,
206-
) -> TerminatorEdge<'mir, 'tcx> {
206+
) -> TerminatorEdges<'mir, 'tcx> {
207207
let idx = self.effect(Effect::Primary.at_index(location.statement_index));
208208
assert!(state.insert(idx));
209209
terminator.edges()

‎compiler/rustc_mir_dataflow/src/impls/borrowed_locals.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ impl<'tcx> GenKillAnalysis<'tcx> for MaybeBorrowedLocals {
5454
trans: &mut Self::Domain,
5555
terminator: &'mir Terminator<'tcx>,
5656
location: Location,
57-
) -> TerminatorEdge<'mir, 'tcx> {
57+
) -> TerminatorEdges<'mir, 'tcx> {
5858
self.transfer_function(trans).visit_terminator(terminator, location);
5959
terminator.edges()
6060
}

‎compiler/rustc_mir_dataflow/src/impls/initialized.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rustc_index::bit_set::{BitSet, ChunkedBitSet};
22
use rustc_index::Idx;
3-
use rustc_middle::mir::{self, Body, CallReturnPlaces, Location, TerminatorEdge};
3+
use rustc_middle::mir::{self, Body, CallReturnPlaces, Location, TerminatorEdges};
44
use rustc_middle::ty::{self, TyCtxt};
55

66
use crate::drop_flag_effects_for_function_entry;
@@ -362,14 +362,14 @@ impl<'tcx> GenKillAnalysis<'tcx> for MaybeInitializedPlaces<'_, 'tcx> {
362362
state: &mut Self::Domain,
363363
terminator: &'mir mir::Terminator<'tcx>,
364364
location: Location,
365-
) -> TerminatorEdge<'mir, 'tcx> {
365+
) -> TerminatorEdges<'mir, 'tcx> {
366366
let mut edges = terminator.edges();
367367
if self.skip_unreachable_unwind
368368
&& let mir::TerminatorKind::Drop { target, unwind, place, replace: _ } = terminator.kind
369369
&& matches!(unwind, mir::UnwindAction::Cleanup(_))
370370
&& self.is_unwind_dead(place, state)
371371
{
372-
edges = TerminatorEdge::Single(target);
372+
edges = TerminatorEdges::Single(target);
373373
}
374374
drop_flag_effects_for_location(self.tcx, self.body, self.mdpe, location, |path, s| {
375375
Self::update_bits(state, path, s)
@@ -491,14 +491,14 @@ impl<'tcx> GenKillAnalysis<'tcx> for MaybeUninitializedPlaces<'_, 'tcx> {
491491
trans: &mut Self::Domain,
492492
terminator: &'mir mir::Terminator<'tcx>,
493493
location: Location,
494-
) -> TerminatorEdge<'mir, 'tcx> {
494+
) -> TerminatorEdges<'mir, 'tcx> {
495495
drop_flag_effects_for_location(self.tcx, self.body, self.mdpe, location, |path, s| {
496496
Self::update_bits(trans, path, s)
497497
});
498498
if self.skip_unreachable_unwind.contains(location.block) {
499499
let mir::TerminatorKind::Drop { target, unwind, .. } = terminator.kind else { bug!() };
500500
assert!(matches!(unwind, mir::UnwindAction::Cleanup(_)));
501-
TerminatorEdge::Single(target)
501+
TerminatorEdges::Single(target)
502502
} else {
503503
terminator.edges()
504504
}
@@ -619,7 +619,7 @@ impl<'tcx> GenKillAnalysis<'tcx> for DefinitelyInitializedPlaces<'_, 'tcx> {
619619
trans: &mut Self::Domain,
620620
terminator: &'mir mir::Terminator<'tcx>,
621621
location: Location,
622-
) -> TerminatorEdge<'mir, 'tcx> {
622+
) -> TerminatorEdges<'mir, 'tcx> {
623623
drop_flag_effects_for_location(self.tcx, self.body, self.mdpe, location, |path, s| {
624624
Self::update_bits(trans, path, s)
625625
});
@@ -702,7 +702,7 @@ impl<'tcx> GenKillAnalysis<'tcx> for EverInitializedPlaces<'_, 'tcx> {
702702
trans: &mut Self::Domain,
703703
terminator: &'mir mir::Terminator<'tcx>,
704704
location: Location,
705-
) -> TerminatorEdge<'mir, 'tcx> {
705+
) -> TerminatorEdges<'mir, 'tcx> {
706706
let (body, move_data) = (self.body, self.move_data());
707707
let term = body[location.block].terminator();
708708
let init_loc_map = &move_data.init_loc_map;

‎compiler/rustc_mir_dataflow/src/impls/liveness.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rustc_index::bit_set::{BitSet, ChunkedBitSet};
22
use rustc_middle::mir::visit::{MutatingUseContext, NonMutatingUseContext, PlaceContext, Visitor};
33
use rustc_middle::mir::{
4-
self, CallReturnPlaces, Local, Location, Place, StatementKind, TerminatorEdge,
4+
self, CallReturnPlaces, Local, Location, Place, StatementKind, TerminatorEdges,
55
};
66

77
use crate::{Analysis, AnalysisDomain, Backward, GenKill, GenKillAnalysis};
@@ -63,7 +63,7 @@ impl<'tcx> GenKillAnalysis<'tcx> for MaybeLiveLocals {
6363
trans: &mut Self::Domain,
6464
terminator: &'mir mir::Terminator<'tcx>,
6565
location: Location,
66-
) -> TerminatorEdge<'mir, 'tcx> {
66+
) -> TerminatorEdges<'mir, 'tcx> {
6767
TransferFunction(trans).visit_terminator(terminator, location);
6868
terminator.edges()
6969
}
@@ -280,9 +280,9 @@ impl<'a, 'tcx> Analysis<'tcx> for MaybeTransitiveLiveLocals<'a> {
280280
trans: &mut Self::Domain,
281281
terminator: &'mir mir::Terminator<'tcx>,
282282
location: Location,
283-
) -> TerminatorEdge<'mir, 'tcx> {
283+
) -> TerminatorEdges<'mir, 'tcx> {
284284
TransferFunction(trans).visit_terminator(terminator, location);
285-
TerminatorEdge::None
285+
TerminatorEdges::None
286286
}
287287

288288
fn apply_call_return_effect(

‎compiler/rustc_mir_dataflow/src/impls/storage_liveness.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ impl<'tcx, 'a> crate::GenKillAnalysis<'tcx> for MaybeStorageLive<'a> {
7171
_trans: &mut Self::Domain,
7272
terminator: &'mir Terminator<'tcx>,
7373
_: Location,
74-
) -> TerminatorEdge<'mir, 'tcx> {
74+
) -> TerminatorEdges<'mir, 'tcx> {
7575
// Terminators have no effect
7676
terminator.edges()
7777
}
@@ -143,7 +143,7 @@ impl<'tcx> crate::GenKillAnalysis<'tcx> for MaybeStorageDead {
143143
_: &mut Self::Domain,
144144
terminator: &'mir Terminator<'tcx>,
145145
_: Location,
146-
) -> TerminatorEdge<'mir, 'tcx> {
146+
) -> TerminatorEdges<'mir, 'tcx> {
147147
// Terminators have no effect
148148
terminator.edges()
149149
}
@@ -310,7 +310,7 @@ impl<'tcx> crate::GenKillAnalysis<'tcx> for MaybeRequiresStorage<'_, '_, 'tcx> {
310310
trans: &mut Self::Domain,
311311
terminator: &'t Terminator<'tcx>,
312312
loc: Location,
313-
) -> TerminatorEdge<'t, 'tcx> {
313+
) -> TerminatorEdges<'t, 'tcx> {
314314
match terminator.kind {
315315
// For call terminators the destination requires storage for the call
316316
// and after the call returns successfully, but not after a panic.

0 commit comments

Comments
 (0)