nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-02 07:22:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

use non-ascribed type as field type in mir

Browse Source
This commit is contained in:
b-naber 2022-11-02 13:39:47 +01:00
parent ac31d52324
commit 4d3a91b12b
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_mir_build/src/build/matches/simplify.rs
View File

@ -294,7 +294,9 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
PatKind::Leaf { ref subpatterns } => {
// tuple struct, match subpats (if any)
candidate.match_pairs.extend(self.field_match_pairs(match_pair.place, subpatterns));
candidate
.match_pairs
.extend(self.field_match_pairs_tuple_struct(match_pair.place, subpatterns));
Ok(())
}

45
compiler/rustc_mir_build/src/build/matches/util.rs
View File

@ -25,6 +25,51 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
.collect()
}
#[instrument(skip(self), level = "debug")]
pub(crate) fn field_match_pairs_tuple_struct<'pat>(
&mut self,
place_builder: PlaceBuilder<'tcx>,
subpatterns: &'pat [FieldPat<'tcx>],
) -> Vec<MatchPair<'pat, 'tcx>> {
let place_ty = place_builder
.try_ty(&self.local_decls, self)
.map(|ty| self.tcx.normalize_erasing_regions(self.param_env, ty));
debug!(?place_ty);
subpatterns
.iter()
.map(|fieldpat| {
// NOTE: With type ascriptions it can happen that we get errors
// during borrow-checking on higher-ranked types if we use the
// ascribed type as the field type, so we try to get the actual field
// type from the `Place`, if possible, see issue #96514
let field_ty = if let Some(place_ty) = place_ty {
let field_idx = fieldpat.field.as_usize();
let field_ty = match place_ty.kind() {
ty::Adt(adt_def, substs) => {
adt_def.all_fields().collect::<Vec<_>>()[field_idx].ty(self.tcx, substs)
}
ty::Tuple(elems) => elems.to_vec()[field_idx],
_ => bug!(
"no field available, place_ty: {:#?}, kind: {:?}",
place_ty,
place_ty.kind()
),
};
self.tcx.normalize_erasing_regions(self.param_env, field_ty)
} else {
fieldpat.pattern.ty
};
let place = place_builder.clone().field(fieldpat.field, field_ty);
debug!(?place, ?field_ty);
MatchPair::new(place, &fieldpat.pattern, self)
})
.collect()
}
pub(crate) fn prefix_slice_suffix<'pat>(
&mut self,
match_pairs: &mut SmallVec<[MatchPair<'pat, 'tcx>; 1]>,