Skip late-bound lifetimes when crossing an AnonConst.

Author: cjgillot

compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs

@@ -573,11 +573,17 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
 // give, we will reverse the IndexMap after early captures.
 letmut late_depth = 0;
 letmut scope = self.scope;
+letmut crossed_late_boundary = None;
 letmut opaque_capture_scopes = vec![(opaque.def_id,&captures)];
 loop{
 match*scope {
 Scope::Binder{ref bound_vars, scope_type, s, .. } => {
 for(&original_lifetime,&def)in bound_vars.iter().rev(){
+ifletResolvedArg::LateBound(..) = def
+ && crossed_late_boundary.is_some()
+{
+continue;
+}
 ifletDefKind::LifetimeParam = self.tcx.def_kind(original_lifetime){
 let def = def.shifted(late_depth);
 let ident = lifetime_ident(original_lifetime);
@@ -618,8 +624,12 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
 
 Scope::ObjectLifetimeDefault{ s, .. }
  | Scope::Supertrait{ s, .. }
- | Scope::TraitRefBoundary{ s, .. }
- | Scope::LateBoundary{ s, .. } => {
+ | Scope::TraitRefBoundary{ s, .. } => {
+ scope = s;
+}
+
+Scope::LateBoundary{ s, what, .. } => {
+ crossed_late_boundary = Some(what);
  scope = s;
 }
 }