mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #121324 - Nadrieril:unspecialize, r=cjgillot

Browse Source 
pattern_analysis: factor out unspecialization

Just moving a dense bit of logic into its own method.
This commit is contained in:
Matthias Krüger 2024-02-25 17:05:21 +01:00 committed by GitHub
commit 86a35c07b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
compiler/rustc_pattern_analysis/src/usefulness.rs
View File

@ -1189,6 +1189,25 @@ fn specialize_constructor(
} }
Ok(matrix) Ok(matrix)
} }
/// Recover row usefulness and intersection information from a processed specialized matrix.
/// `specialized` must come from `self.specialize_constructor`.
fn unspecialize(&mut self, specialized: Self) {
for child_row in specialized.rows() {
let parent_row_id = child_row.parent_row;
let parent_row = &mut self.rows[parent_row_id];
// A parent row is useful if any of its children is.
parent_row.useful |= child_row.useful;
for child_intersection in child_row.intersects.iter() {
// Convert the intersecting ids into ids for the parent matrix.
let parent_intersection = specialized.rows[child_intersection].parent_row;
// Note: self-intersection can happen with or-patterns.
if parent_intersection != parent_row_id {
parent_row.intersects.insert(parent_intersection);
}
}
}
}
} }
/// Pretty-printer for matrices of patterns, example: /// Pretty-printer for matrices of patterns, example:
@ -1558,21 +1577,6 @@ fn compute_exhaustiveness_and_usefulness<'a, 'p, Cx: TypeCx>(
// Accumulate the found witnesses. // Accumulate the found witnesses.
ret.extend(witnesses); ret.extend(witnesses);
for child_row in spec_matrix.rows() {
let parent_row_id = child_row.parent_row;
let parent_row = &mut matrix.rows[parent_row_id];
// A parent row is useful if any of its children is.
parent_row.useful |= child_row.useful;
for child_intersection in child_row.intersects.iter() {
// Convert the intersecting ids into ids for the parent matrix.
let parent_intersection = spec_matrix.rows[child_intersection].parent_row;
// Note: self-intersection can happen with or-patterns.
if parent_intersection != parent_row_id {
parent_row.intersects.insert(parent_intersection);
}
}
}
// Detect ranges that overlap on their endpoints. // Detect ranges that overlap on their endpoints.
if let Constructor::IntRange(overlap_range) = ctor { if let Constructor::IntRange(overlap_range) = ctor {
if overlap_range.is_singleton() if overlap_range.is_singleton()
@ -1582,6 +1586,8 @@ fn compute_exhaustiveness_and_usefulness<'a, 'p, Cx: TypeCx>(
collect_overlapping_range_endpoints(mcx, overlap_range, matrix, &spec_matrix); collect_overlapping_range_endpoints(mcx, overlap_range, matrix, &spec_matrix);
} }
} }
matrix.unspecialize(spec_matrix);
} }
// Record usefulness in the patterns. // Record usefulness in the patterns.