bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Keep going if normalized projection has unevaluated consts in QueryNormalizer

Browse source
This commit is contained in:
Michael Goulet 2022-08-09 09:41:23 +00:00
parent 6f18f0a9d4
commit ca7e3c4a83
7 changed files with 287 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_trait_selection/src/traits/query/normalize.rs
View file

@ -194,7 +194,7 @@ impl<'cx, 'tcx> FallibleTypeFolder<'tcx> for QueryNormalizer<'cx, 'tcx> {
// wait to fold the substs.
// Wrap this in a closure so we don't accidentally return from the outer function
let res = (|| match *ty.kind() {
let mut res = (|| match *ty.kind() {
// This is really important. While we *can* handle this, this has
// severe performance implications for large opaque types with
// late-bound regions. See `issue-88862` benchmark.
@ -317,6 +317,13 @@ impl<'cx, 'tcx> FallibleTypeFolder<'tcx> for QueryNormalizer<'cx, 'tcx> {
_ => ty.try_super_fold_with(self),
})()?;
// `tcx.normalize_projection_ty` may normalize to a type that still has
// unevaluated consts, so keep normalizing here if that's the case.
if res != ty && res.has_type_flags(ty::TypeFlags::HAS_CT_PROJECTION) {
res = res.try_super_fold_with(self)?;
}
self.cache.insert(ty, res);
Ok(res)
}