Skip to content

Normalize field type for InhabitedPredicate #158921

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

Draft
camsteffen wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −10
Draft

Normalize field type for InhabitedPredicate #158921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions compiler/rustc_middle/src/ty/inhabitedness/inhabited_predicate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,7 @@ impl<'tcx> InhabitedPredicate<'tcx> {
Some(InhabitedPredicate::True) => Some(InhabitedPredicate::True),
Some(a) => Some(a.or(tcx, b.instantiate_opt(tcx, args).unwrap_or(b))),
},
Self::True | Self::False | Self::NotInModule(_) => None,
Self::OpaqueType(_) => {
bug!("unexpected OpaqueType in InhabitedPredicate");
}
Self::True | Self::False | Self::NotInModule(_) | Self::OpaqueType(_) => None,
}
}
}
Expand Down
13 changes: 7 additions & 6 deletions compiler/rustc_middle/src/ty/inhabitedness/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ use rustc_type_ir::TyKind::*;
use tracing::instrument;

use crate::query::Providers;
use crate::ty::{self, DefId, Ty, TyCtxt, TypeVisitableExt, VariantDef, Visibility};
use crate::ty::{self, DefId, Ty, TyCtxt, TypeVisitableExt, TypingEnv, VariantDef, Visibility};

pub mod inhabited_predicate;

Expand Down Expand Up @@ -82,11 +82,12 @@ impl<'tcx> VariantDef {
InhabitedPredicate::all(
tcx,
self.fields.iter().map(|field| {
let pred = tcx
.type_of(field.did)
.instantiate_identity()
.skip_norm_wip()
.inhabited_predicate(tcx);
let field_ty = tcx.normalize_erasing_regions(
TypingEnv::non_body_analysis(tcx, adt.did()),
tcx.type_of(field.did).instantiate_identity(),
);
let pred = field_ty.inhabited_predicate(tcx);

if adt.is_enum() {
return pred;
}
Expand Down
Loading