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

Add const_eval_select intrinsic

Browse source
This commit is contained in:
Deadbeef 2021-10-12 05:06:37 +00:00
parent 0c87288f92
commit 5387b6542f
No known key found for this signature in database
GPG key ID: 027DF9338862ADDD
20 changed files with 334 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_trait_selection/src/traits/select/candidate_assembly.rs
View file

@ -973,12 +973,16 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
ty::Tuple(_) => stack.extend(ty.tuple_fields().map(|t| (t, depth + 1))),
ty::Closure(_, substs) => {
stack.extend(substs.as_closure().upvar_tys().map(|t| (t, depth + 1)))
let substs = substs.as_closure();
let ty = self.infcx.shallow_resolve(substs.tupled_upvars_ty());
stack.push((ty, depth + 1));
}
ty::Generator(_, substs, _) => {
let substs = substs.as_generator();
stack.extend(substs.upvar_tys().map(|t| (t, depth + 1)));
let ty = self.infcx.shallow_resolve(substs.tupled_upvars_ty());
stack.push((ty, depth + 1));
stack.push((substs.witness(), depth + 1));
}