mirror of
https://github.com/rust-lang/rust.git
synced 2025-06-20 03:27:30 +00:00
4d8316f4d4
Current `SwitchInt` handling has complicated control flow. - The dataflow engine calls `Analysis::apply_switch_int_edge_effects`, passing in an "applier" that impls `SwitchIntEdgeEffects`. - `apply_switch_int_edge_effects` possibly calls `apply` on the applier, passing it a closure. - The `apply` method calls the closure on each `SwitchInt` edge. - The closure operates on the edge. I.e. control flow goes from the engine, to the analysis, to the applier (which came from the engine), to the closure (which came from the analysis). It took me a while to work this out. This commit changes to a simpler structure that maintains the important characteristics. - The dataflow engine calls `Analysis::get_switch_int_data`. - `get_switch_int_data` returns an `Option<Self::SwitchIntData>` value. - If that returned value was `Some`, the dataflow engine calls `Analysis::apply_switch_int_edge_effect` on each edge, passing the `Self::SwitchIntData` value. - `Analysis::apply_switch_int_edge_effect` operates on the edge. I.e. control flow goes from the engine, to the analysis, to the engine, to the analysis. Added: - The `Analysis::SwitchIntData` assoc type and the `Analysis::get_switch_int_data` method. Both only need to be defined by analyses that look at `SwitchInt` terminators. - The `MaybePlacesSwitchIntData` struct, which has three fields. Changes: - `Analysis::apply_switch_int_edge_effects` becomes `Analysis::apply_switch_int_edge_effect`, which is a little simpler because it's dealing with a single edge instead of all edges. Removed: - The `SwitchIntEdgeEffects` trait, and its two impls: `BackwardSwitchIntEdgeEffectsApplier` (which has six fields) and `ForwardSwitchIntEdgeEffectsApplier` structs (which has four fields). - The closure. The new structure is more concise and simpler.
45 lines
1.2 KiB
Rust
45 lines
1.2 KiB
Rust
// tidy-alphabetical-start
|
|
#![feature(assert_matches)]
|
|
#![feature(associated_type_defaults)]
|
|
#![feature(box_patterns)]
|
|
#![feature(exact_size_is_empty)]
|
|
#![feature(file_buffered)]
|
|
#![feature(let_chains)]
|
|
#![feature(never_type)]
|
|
#![feature(try_blocks)]
|
|
#![warn(unreachable_pub)]
|
|
// tidy-alphabetical-end
|
|
|
|
use rustc_middle::ty;
|
|
|
|
// Please change the public `use` directives cautiously, as they might be used by external tools.
|
|
// See issue #120130.
|
|
pub use self::drop_flag_effects::{
|
|
drop_flag_effects_for_function_entry, drop_flag_effects_for_location,
|
|
move_path_children_matching, on_all_children_bits, on_lookup_result_bits,
|
|
};
|
|
pub use self::framework::{
|
|
Analysis, Backward, Direction, EntryStates, Forward, GenKill, JoinSemiLattice, MaybeReachable,
|
|
Results, ResultsCursor, ResultsVisitor, fmt, graphviz, lattice, visit_results,
|
|
};
|
|
use self::move_paths::MoveData;
|
|
|
|
pub mod debuginfo;
|
|
mod drop_flag_effects;
|
|
pub mod elaborate_drops;
|
|
mod errors;
|
|
mod framework;
|
|
pub mod impls;
|
|
pub mod move_paths;
|
|
pub mod points;
|
|
pub mod rustc_peek;
|
|
mod un_derefer;
|
|
pub mod value_analysis;
|
|
|
|
rustc_fluent_macro::fluent_messages! { "../messages.ftl" }
|
|
|
|
pub struct MoveDataTypingEnv<'tcx> {
|
|
pub move_data: MoveData<'tcx>,
|
|
pub typing_env: ty::TypingEnv<'tcx>,
|
|
}
|