bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Reuse ctor_sub_tys when we have one around

Browse source
This commit is contained in:
Nadrieril 2024-01-06 17:58:57 +01:00
parent d40f1b1172
commit 50b197c6ee
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_pattern_analysis/src/lints.rs
View file

@ -83,8 +83,9 @@ impl<'p, 'tcx> PatternColumn<'p, 'tcx> {
(0..arity).map(|_| Self { patterns: Vec::new() }).collect(); (0..arity).map(|_| Self { patterns: Vec::new() }).collect();
let relevant_patterns = let relevant_patterns =
self.patterns.iter().filter(|pat| ctor.is_covered_by(pcx, pat.ctor())); self.patterns.iter().filter(|pat| ctor.is_covered_by(pcx, pat.ctor()));
let ctor_sub_tys = pcx.ctor_sub_tys(ctor);
for pat in relevant_patterns { for pat in relevant_patterns {
let specialized = pat.specialize(pcx, ctor); let specialized = pat.specialize(pcx, ctor, ctor_sub_tys);
for (subpat, column) in specialized.iter().zip(&mut specialized_columns) { for (subpat, column) in specialized.iter().zip(&mut specialized_columns) {
if subpat.is_or_pat() { if subpat.is_or_pat() {
column.patterns.extend(subpat.flatten_or_pat()) column.patterns.extend(subpat.flatten_or_pat())

5
compiler/rustc_pattern_analysis/src/pat.rs
View file

@ -81,10 +81,11 @@ impl<'p, Cx: TypeCx> DeconstructedPat<'p, Cx> {
&self, &self,
pcx: &PlaceCtxt<'_, 'p, Cx>, pcx: &PlaceCtxt<'_, 'p, Cx>,
other_ctor: &Constructor<Cx>, other_ctor: &Constructor<Cx>,
ctor_sub_tys: &[Cx::Ty],
) -> SmallVec<[&'p DeconstructedPat<'p, Cx>; 2]> { ) -> SmallVec<[&'p DeconstructedPat<'p, Cx>; 2]> {
let wildcard_sub_tys = || { let wildcard_sub_tys = || {
let tys = pcx.ctor_sub_tys(other_ctor); ctor_sub_tys
tys.iter() .iter()
.map(|ty| DeconstructedPat::wildcard(*ty)) .map(|ty| DeconstructedPat::wildcard(*ty))
.map(|pat| pcx.mcx.wildcard_arena.alloc(pat) as &_) .map(|pat| pcx.mcx.wildcard_arena.alloc(pat) as &_)
.collect() .collect()

9
compiler/rustc_pattern_analysis/src/usefulness.rs
View file

@ -874,11 +874,12 @@ impl<'p, Cx: TypeCx> PatStack<'p, Cx> {
&self, &self,
pcx: &PlaceCtxt<'_, 'p, Cx>, pcx: &PlaceCtxt<'_, 'p, Cx>,
ctor: &Constructor<Cx>, ctor: &Constructor<Cx>,
ctor_sub_tys: &[Cx::Ty],
ctor_is_relevant: bool, ctor_is_relevant: bool,
) -> PatStack<'p, Cx> { ) -> PatStack<'p, Cx> {
// We pop the head pattern and push the new fields extracted from the arguments of // We pop the head pattern and push the new fields extracted from the arguments of
// `self.head()`. // `self.head()`.
let mut new_pats = self.head().specialize(pcx, ctor); let mut new_pats = self.head().specialize(pcx, ctor, ctor_sub_tys);
new_pats.extend_from_slice(&self.pats[1..]); new_pats.extend_from_slice(&self.pats[1..]);
// `ctor` is relevant for this row if it is the actual constructor of this row, or if the // `ctor` is relevant for this row if it is the actual constructor of this row, or if the
// row has a wildcard and `ctor` is relevant for wildcards. // row has a wildcard and `ctor` is relevant for wildcards.
@ -950,11 +951,12 @@ impl<'p, Cx: TypeCx> MatrixRow<'p, Cx> {
&self, &self,
pcx: &PlaceCtxt<'_, 'p, Cx>, pcx: &PlaceCtxt<'_, 'p, Cx>,
ctor: &Constructor<Cx>, ctor: &Constructor<Cx>,
ctor_sub_tys: &[Cx::Ty],
ctor_is_relevant: bool, ctor_is_relevant: bool,
parent_row: usize, parent_row: usize,
) -> MatrixRow<'p, Cx> { ) -> MatrixRow<'p, Cx> {
MatrixRow { MatrixRow {
pats: self.pats.pop_head_constructor(pcx, ctor, ctor_is_relevant), pats: self.pats.pop_head_constructor(pcx, ctor, ctor_sub_tys, ctor_is_relevant),
parent_row, parent_row,
is_under_guard: self.is_under_guard, is_under_guard: self.is_under_guard,
useful: false, useful: false,
@ -1079,7 +1081,8 @@ impl<'p, Cx: TypeCx> Matrix<'p, Cx> {
}; };
for (i, row) in self.rows().enumerate() { for (i, row) in self.rows().enumerate() {
if ctor.is_covered_by(pcx, row.head().ctor()) { if ctor.is_covered_by(pcx, row.head().ctor()) {
let new_row = row.pop_head_constructor(pcx, ctor, ctor_is_relevant, i); let new_row =
row.pop_head_constructor(pcx, ctor, ctor_sub_tys, ctor_is_relevant, i);
matrix.expand_and_push(new_row); matrix.expand_and_push(new_row);
} }
} }