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

Reimplement ConstProp using DataflowConstProp #110719

Closed
wants to merge 4 commits into from
Closed

Reimplement ConstProp using DataflowConstProp #110719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f23572
Reimplement standard ConstProp using DataflowConstProp.
cjgillot Apr 23, 2023
f01eb11
Always compute rvalues.
cjgillot May 2, 2023
b1c7b7d
Bless incremental test.
cjgillot Apr 26, 2023
bf37a5c
Bless coverage-map.
cjgillot Sep 9, 2023
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
16 changes: 10 additions & 6 deletions compiler/rustc_mir_dataflow/src/value_analysis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,8 +638,13 @@ impl Map {
///
/// This is currently the only way to create a [`Map`]. The way in which the tracked places are
/// chosen is an implementation detail and may not be relied upon (other than that their type
/// are scalars).
pub fn new<'tcx>(tcx: TyCtxt<'tcx>, body: &Body<'tcx>, value_limit: Option<usize>) -> Self {
/// are scalars and pass the filter).
pub fn from_filter<'tcx>(
tcx: TyCtxt<'tcx>,
body: &Body<'tcx>,
filter: impl Fn(Local) -> bool,
value_limit: Option<usize>,
) -> Self {
let mut map = Self {
locals: IndexVec::new(),
projections: FxHashMap::default(),
Expand All @@ -648,8 +653,7 @@ impl Map {
inner_values: IndexVec::new(),
inner_values_buffer: Vec::new(),
};
let exclude = excluded_locals(body);
map.register(tcx, body, exclude, value_limit);
map.register(tcx, body, filter, value_limit);
debug!("registered {} places ({} nodes in total)", map.value_count, map.places.len());
map
}
Expand All @@ -659,7 +663,7 @@ impl Map {
&mut self,
tcx: TyCtxt<'tcx>,
body: &Body<'tcx>,
exclude: BitSet<Local>,
filter: impl Fn(Local) -> bool,
value_limit: Option<usize>,
) {
let mut worklist = VecDeque::with_capacity(value_limit.unwrap_or(body.local_decls.len()));
Expand All @@ -668,7 +672,7 @@ impl Map {
// Start by constructing the places for each bare local.
self.locals = IndexVec::from_elem(None, &body.local_decls);
for (local, decl) in body.local_decls.iter_enumerated() {
if exclude.contains(local) {
if !filter(local) {
continue;
}

Expand Down
Loading