mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #89823 - jackh726:project-overflow, r=oli-obk

Browse source 
Switch order of terms to prevent overflow

Fixes #89639

r? ``@pnkfelix``
This commit is contained in:
Matthias Krüger 2021-10-14 16:06:45 +02:00 • committed by GitHub
commit 29081f95e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_trait_selection/src/traits/project.rs
View file

@ -558,7 +558,7 @@ impl<'me, 'tcx> BoundVarReplacer<'me, 'tcx> {
fn universe_for(&mut self, debruijn: ty::DebruijnIndex) -> ty::UniverseIndex { fn universe_for(&mut self, debruijn: ty::DebruijnIndex) -> ty::UniverseIndex {
let infcx = self.infcx; let infcx = self.infcx;
let index = let index =
self.universe_indices.len() - debruijn.as_usize() + self.current_index.as_usize() - 1; self.universe_indices.len() + self.current_index.as_usize() - debruijn.as_usize() - 1;
let universe = self.universe_indices[index].unwrap_or_else(|| { let universe = self.universe_indices[index].unwrap_or_else(|| {
for i in self.universe_indices.iter_mut().take(index + 1) { for i in self.universe_indices.iter_mut().take(index + 1) {
*i = i.or_else(|| Some(infcx.create_next_universe())) *i = i.or_else(|| Some(infcx.create_next_universe()))