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

Uniquify ReError on input mode in canonicalizer

Browse source
This commit is contained in:
Michael Goulet 2024-03-22 16:35:44 -04:00
parent 1447f9d38c
commit 1fcf2eaa9f
3 changed files with 50 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_next_trait_solver/src/canonicalizer.rs
View file

@ -239,7 +239,7 @@ impl<Infcx: InferCtxtLike<Interner = I>, I: Interner> TypeFolder<I>
// FIXME: We should investigate the perf implications of not uniquifying
// `ReErased`. We may be able to short-circuit registering region
// obligations if we encounter a `ReErased` on one side, for example.
ty::ReStatic | ty::ReErased => match self.canonicalize_mode {
ty::ReStatic | ty::ReErased | ty::ReError(_) => match self.canonicalize_mode {
CanonicalizeMode::Input => CanonicalVarKind::Region(ty::UniverseIndex::ROOT),
CanonicalizeMode::Response { .. } => return r,
},
@ -277,7 +277,6 @@ impl<Infcx: InferCtxtLike<Interner = I>, I: Interner> TypeFolder<I>
}
}
}
ty::ReError(_) => return r,
};
let existing_bound_var = match self.canonicalize_mode {