mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #88320 - sexxi-goose:issue-88103, r=nikomatsakis

Browse Source 
type_implements_trait consider obligation failure on overflow

Fixes: #88103
This commit is contained in:
Manish Goregaokar 2021-08-26 12:38:11 -07:00 committed by GitHub
commit c418a48737
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_trait_selection/src/infer.rs
View File

@ -44,6 +44,10 @@ fn partially_normalize_associated_types_in<T>(
/// - the self type
/// - the *other* type parameters of the trait, excluding the self-type
/// - the parameter environment
///
/// Invokes `evaluate_obligation`, so in the event that evaluating
/// `Ty: Trait` causes overflow, EvaluatedToRecur (or EvaluatedToUnknown)
/// will be returned.
fn type_implements_trait(
&self,
trait_def_id: DefId,
@ -117,7 +121,7 @@ fn type_implements_trait(
recursion_depth: 0,
predicate: trait_ref.without_const().to_predicate(self.tcx),
};
self.evaluate_obligation_no_overflow(&obligation)
self.evaluate_obligation(&obligation).unwrap_or(traits::EvaluationResult::EvaluatedToErr)
}
}