bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #102853 - cjgillot:skip-opaque-cast, r=jackh726

Browse source 
Skip chained OpaqueCast when building captures.

Fixes https://github.com/rust-lang/rust/issues/102089
This commit is contained in:
Dylan DPC 2022-10-10 13:43:42 +05:30 • committed by GitHub
commit 5a09b72156
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_mir_build/src/build/expr/as_place.rs
View file

@ -17,6 +17,7 @@ use rustc_target::abi::VariantIdx;
use rustc_index::vec::Idx;
use std::assert_matches::assert_matches;
use std::iter;
/// The "outermost" place that holds this value.
@ -232,22 +233,20 @@ fn strip_prefix<'tcx>(
projections: Vec<PlaceElem<'tcx>>,
prefix_projections: &[HirProjection<'tcx>],
) -> impl Iterator<Item = PlaceElem<'tcx>> {
let mut iter = projections.into_iter();
let mut next = || match iter.next()? {
let mut iter = projections
.into_iter()
// Filter out opaque casts, they are unnecessary in the prefix.
ProjectionElem::OpaqueCast(..) => iter.next(),
other => Some(other),
};
.filter(|elem| !matches!(elem, ProjectionElem::OpaqueCast(..)));
for projection in prefix_projections {
match projection.kind {
HirProjectionKind::Deref => {
assert!(matches!(next(), Some(ProjectionElem::Deref)));
assert_matches!(iter.next(), Some(ProjectionElem::Deref));
}
HirProjectionKind::Field(..) => {
if base_ty.is_enum() {
assert!(matches!(next(), Some(ProjectionElem::Downcast(..))));
assert_matches!(iter.next(), Some(ProjectionElem::Downcast(..)));
}
assert!(matches!(next(), Some(ProjectionElem::Field(..))));
assert_matches!(iter.next(), Some(ProjectionElem::Field(..)));
}
HirProjectionKind::Index | HirProjectionKind::Subslice => {
bug!("unexpected projection kind: {:?}", projection);

1
compiler/rustc_mir_build/src/lib.rs
View file

@ -2,6 +2,7 @@
//!
//! This crate also contains the match exhaustiveness and usefulness checking.
#![allow(rustc::potential_query_instability)]
#![feature(assert_matches)]
#![feature(box_patterns)]
#![feature(control_flow_enum)]
#![feature(if_let_guard)]