bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

add test for builtin types N + N unifying with fn call

Browse source
This commit is contained in:
Ellen 2021-09-09 15:43:59 +01:00
parent fd9bb30ab8
commit 8295e4a6cf
4 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/rustc_trait_selection/src/traits/const_evaluatable.rs
View file

@ -267,10 +267,16 @@ impl<'a, 'tcx> AbstractConstBuilder<'a, 'tcx> {
fn visit_expr(&mut self, expr: &thir::Expr<'tcx>) {
self.is_poly |= expr.ty.definitely_has_param_types_or_consts(self.tcx);
if self.is_poly {
return;
if self.is_poly == false {
visit::walk_expr(self, expr)
}
}
fn visit_pat(&mut self, pat: &thir::Pat<'tcx>) {
self.is_poly |= pat.ty.definitely_has_param_types_or_consts(self.tcx);
if self.is_poly == false {
visit::walk_pat(self, pat);
}
visit::walk_expr(self, expr);
}
fn visit_const(&mut self, ct: &'tcx ty::Const<'tcx>) {
@ -280,6 +286,7 @@ impl<'a, 'tcx> AbstractConstBuilder<'a, 'tcx> {
let mut is_poly_vis = IsThirPolymorphic { is_poly: false, thir: body, tcx };
visit::walk_expr(&mut is_poly_vis, &body[body_id]);
debug!("AbstractConstBuilder: is_poly={}", is_poly_vis.is_poly);
if is_poly_vis.is_poly == false {
return Ok(None);
}