@@ -24,6 +24,8 @@ use rustc_span::symbol::{sym, Ident};
2424use rustc_span:: Span ;
2525use std:: fmt;
2626
27+ use crate :: errors;
28+
2729trait RegionExt {
2830 fn early ( param : & GenericParam < ' _ > ) -> ( LocalDefId , ResolvedArg ) ;
2931
@@ -161,6 +163,15 @@ enum Scope<'a> {
161163 s : ScopeRef < ' a > ,
162164 } ,
163165
166+ /// Disallows capturing non-lifetime binders from parent scopes.
167+ ///
168+ /// This is necessary for something like `for<T> [(); { /* references T */ }]:`,
169+ /// since we don't do something more correct like replacing any captured
170+ /// late-bound vars with early-bound params in the const's own generics.
171+ AnonConstBoundary {
172+ s : ScopeRef < ' a > ,
173+ } ,
174+
164175 Root {
165176 opt_parent_item : Option < LocalDefId > ,
166177 } ,
@@ -211,6 +222,7 @@ impl<'a> fmt::Debug for TruncatedScopeDebug<'a> {
211222 . field ( "s" , & ".." )
212223 . finish ( ) ,
213224 Scope :: TraitRefBoundary { s : _ } => f. debug_struct ( "TraitRefBoundary" ) . finish ( ) ,
225+ Scope :: AnonConstBoundary { s : _ } => f. debug_struct ( "AnonConstBoundary" ) . finish ( ) ,
214226 Scope :: Root { opt_parent_item } => {
215227 f. debug_struct ( "Root" ) . field ( "opt_parent_item" , & opt_parent_item) . finish ( )
216228 }
@@ -312,7 +324,9 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
312324 break ( vec ! [ ] , BinderScopeType :: Normal ) ;
313325 }
314326
315- Scope :: Elision { s, .. } | Scope :: ObjectLifetimeDefault { s, .. } => {
327+ Scope :: Elision { s, .. }
328+ | Scope :: ObjectLifetimeDefault { s, .. }
329+ | Scope :: AnonConstBoundary { s } => {
316330 scope = s;
317331 }
318332
@@ -1029,6 +1043,12 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
10291043 fn visit_poly_trait_ref ( & mut self , trait_ref : & ' tcx hir:: PolyTraitRef < ' tcx > ) {
10301044 self . visit_poly_trait_ref_inner ( trait_ref, NonLifetimeBinderAllowed :: Allow ) ;
10311045 }
1046+
1047+ fn visit_anon_const ( & mut self , c : & ' tcx hir:: AnonConst ) {
1048+ self . with ( Scope :: AnonConstBoundary { s : self . scope } , |this| {
1049+ intravisit:: walk_anon_const ( this, c) ;
1050+ } ) ;
1051+ }
10321052}
10331053
10341054fn object_lifetime_default ( tcx : TyCtxt < ' _ > , param_def_id : DefId ) -> ObjectLifetimeDefault {
@@ -1275,7 +1295,8 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
12751295 Scope :: Elision { s, .. }
12761296 | Scope :: ObjectLifetimeDefault { s, .. }
12771297 | Scope :: Supertrait { s, .. }
1278- | Scope :: TraitRefBoundary { s, .. } => {
1298+ | Scope :: TraitRefBoundary { s, .. }
1299+ | Scope :: AnonConstBoundary { s } => {
12791300 scope = s;
12801301 }
12811302 }
@@ -1340,7 +1361,8 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
13401361 | Scope :: Elision { s, .. }
13411362 | Scope :: ObjectLifetimeDefault { s, .. }
13421363 | Scope :: Supertrait { s, .. }
1343- | Scope :: TraitRefBoundary { s, .. } => {
1364+ | Scope :: TraitRefBoundary { s, .. }
1365+ | Scope :: AnonConstBoundary { s } => {
13441366 scope = s;
13451367 }
13461368 }
@@ -1359,6 +1381,7 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
13591381 // search.
13601382 let mut late_depth = 0 ;
13611383 let mut scope = self . scope ;
1384+ let mut crossed_anon_const = false ;
13621385 let result = loop {
13631386 match * scope {
13641387 Scope :: Body { s, .. } => {
@@ -1392,10 +1415,36 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
13921415 | Scope :: TraitRefBoundary { s, .. } => {
13931416 scope = s;
13941417 }
1418+
1419+ Scope :: AnonConstBoundary { s } => {
1420+ crossed_anon_const = true ;
1421+ scope = s;
1422+ }
13951423 }
13961424 } ;
13971425
13981426 if let Some ( def) = result {
1427+ if let ResolvedArg :: LateBound ( ..) = def && crossed_anon_const {
1428+ let use_span = self . tcx . hir ( ) . span ( hir_id) ;
1429+ let def_span = self . tcx . def_span ( param_def_id) ;
1430+ match self . tcx . def_kind ( param_def_id) {
1431+ DefKind :: ConstParam => {
1432+ self . tcx . sess . emit_err ( errors:: CannotCaptureLateBoundInAnonConst :: Const {
1433+ use_span,
1434+ def_span,
1435+ } ) ;
1436+ }
1437+ DefKind :: TyParam => {
1438+ self . tcx . sess . emit_err ( errors:: CannotCaptureLateBoundInAnonConst :: Type {
1439+ use_span,
1440+ def_span,
1441+ } ) ;
1442+ }
1443+ _ => unreachable ! ( ) ,
1444+ }
1445+ return ;
1446+ }
1447+
13991448 self . map . defs . insert ( hir_id, def) ;
14001449 return ;
14011450 }
@@ -1474,7 +1523,8 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
14741523 | Scope :: Elision { s, .. }
14751524 | Scope :: ObjectLifetimeDefault { s, .. }
14761525 | Scope :: Supertrait { s, .. }
1477- | Scope :: TraitRefBoundary { s, .. } => {
1526+ | Scope :: TraitRefBoundary { s, .. }
1527+ | Scope :: AnonConstBoundary { s } => {
14781528 scope = s;
14791529 }
14801530 }
@@ -1710,7 +1760,9 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
17101760
17111761 Scope :: ObjectLifetimeDefault { lifetime : Some ( l) , .. } => break l,
17121762
1713- Scope :: Supertrait { s, .. } | Scope :: TraitRefBoundary { s, .. } => {
1763+ Scope :: Supertrait { s, .. }
1764+ | Scope :: TraitRefBoundary { s, .. }
1765+ | Scope :: AnonConstBoundary { s } => {
17141766 scope = s;
17151767 }
17161768 }
0 commit comments