Rollup merge of #135308 - compiler-errors:scope-visit, r=oli-obk

Make sure to walk into nested const blocks in `RegionResolutionVisitor`
Fixes#135306
I tried auditing the rest of the visitors that called `.visit_body`, and it seems like this is the only one that was missing it. I wonder if we should modify intravisit (specifcially, that `NestedBodyFilter` stuff) to make this less likely to happen, tho...
r? oli-obk

Author: matthiaskrgr

compiler/rustc_hir_analysis/src/check/region.rs

@@ -31,7 +31,7 @@ struct Context {
 parent:Option<(Scope,ScopeDepth)>,
 }
 
-structRegionResolutionVisitor<'tcx>{
+structScopeResolutionVisitor<'tcx>{
 tcx:TyCtxt<'tcx>,
 
 // The number of expressions and patterns visited in the current body.
@@ -71,7 +71,7 @@ struct RegionResolutionVisitor<'tcx> {
 }
 
 /// Records the lifetime of a local variable as `cx.var_parent`
-fnrecord_var_lifetime(visitor:&mutRegionResolutionVisitor<'_>,var_id: hir::ItemLocalId){
+fnrecord_var_lifetime(visitor:&mutScopeResolutionVisitor<'_>,var_id: hir::ItemLocalId){
 match visitor.cx.var_parent{
 None => {
 // this can happen in extern fn declarations like
@@ -82,7 +82,7 @@ fn record_var_lifetime(visitor: &mut RegionResolutionVisitor<'_>, var_id: hir::I
 }
 }
 
-fnresolve_block<'tcx>(visitor:&mutRegionResolutionVisitor<'tcx>,blk:&'tcx hir::Block<'tcx>){
+fnresolve_block<'tcx>(visitor:&mutScopeResolutionVisitor<'tcx>,blk:&'tcx hir::Block<'tcx>){
 debug!("resolve_block(blk.hir_id={:?})", blk.hir_id);
 
 let prev_cx = visitor.cx;
@@ -193,7 +193,7 @@ fn resolve_block<'tcx>(visitor: &mut RegionResolutionVisitor<'tcx>, blk: &'tcx h
  visitor.cx = prev_cx;
 }
 
-fnresolve_arm<'tcx>(visitor:&mutRegionResolutionVisitor<'tcx>,arm:&'tcx hir::Arm<'tcx>){
+fnresolve_arm<'tcx>(visitor:&mutScopeResolutionVisitor<'tcx>,arm:&'tcx hir::Arm<'tcx>){
 fnhas_let_expr(expr:&Expr<'_>) -> bool{
 match&expr.kind{
  hir::ExprKind::Binary(_, lhs, rhs) => has_let_expr(lhs) || has_let_expr(rhs),
@@ -220,7 +220,7 @@ fn resolve_arm<'tcx>(visitor: &mut RegionResolutionVisitor<'tcx>, arm: &'tcx hir
  visitor.cx = prev_cx;
 }
 
-fnresolve_pat<'tcx>(visitor:&mutRegionResolutionVisitor<'tcx>,pat:&'tcx hir::Pat<'tcx>){
+fnresolve_pat<'tcx>(visitor:&mutScopeResolutionVisitor<'tcx>,pat:&'tcx hir::Pat<'tcx>){
  visitor.record_child_scope(Scope{local_id: pat.hir_id.local_id,data:ScopeData::Node});
 
 // If this is a binding then record the lifetime of that binding.
@@ -237,7 +237,7 @@ fn resolve_pat<'tcx>(visitor: &mut RegionResolutionVisitor<'tcx>, pat: &'tcx hir
 debug!("resolve_pat - post-increment {} pat = {:?}", visitor.expr_and_pat_count, pat);
 }
 
-fnresolve_stmt<'tcx>(visitor:&mutRegionResolutionVisitor<'tcx>,stmt:&'tcx hir::Stmt<'tcx>){
+fnresolve_stmt<'tcx>(visitor:&mutScopeResolutionVisitor<'tcx>,stmt:&'tcx hir::Stmt<'tcx>){
 let stmt_id = stmt.hir_id.local_id;
 debug!("resolve_stmt(stmt.id={:?})", stmt_id);
 
@@ -256,7 +256,7 @@ fn resolve_stmt<'tcx>(visitor: &mut RegionResolutionVisitor<'tcx>, stmt: &'tcx h
  visitor.cx.parent = prev_parent;
 }
 
-fnresolve_expr<'tcx>(visitor:&mutRegionResolutionVisitor<'tcx>,expr:&'tcx hir::Expr<'tcx>){
+fnresolve_expr<'tcx>(visitor:&mutScopeResolutionVisitor<'tcx>,expr:&'tcx hir::Expr<'tcx>){
 debug!("resolve_expr - pre-increment {} expr = {:?}", visitor.expr_and_pat_count, expr);
 
 let prev_cx = visitor.cx;
@@ -420,10 +420,10 @@ fn resolve_expr<'tcx>(visitor: &mut RegionResolutionVisitor<'tcx>, expr: &'tcx h
 // properly, we can't miss any types.
 
 match expr.kind{
-// Manually recurse over closures and inline consts, because they are the only
-// case of nested bodies that share the parent environment.
-hir::ExprKind::Closure(&hir::Closure{ body, .. })
-| hir::ExprKind::ConstBlock(hir::ConstBlock{ body, .. }) => {
+// Manually recurse over closures, because they are nested bodies
+// that share the parent environment. We handle const blocks in
+// `visit_inline_const`.
+ hir::ExprKind::Closure(&hir::Closure{ body, .. }) => {
 let body = visitor.tcx.hir().body(body);
  visitor.visit_body(body);
 }
@@ -554,7 +554,7 @@ fn resolve_expr<'tcx>(visitor: &mut RegionResolutionVisitor<'tcx>, expr: &'tcx h
 }
 
 fnresolve_local<'tcx>(
-visitor:&mutRegionResolutionVisitor<'tcx>,
+visitor:&mutScopeResolutionVisitor<'tcx>,
 pat:Option<&'tcx hir::Pat<'tcx>>,
 init:Option<&'tcx hir::Expr<'tcx>>,
 ){
@@ -725,7 +725,7 @@ fn resolve_local<'tcx>(
 /// | ( E& )
 /// ```
 fnrecord_rvalue_scope_if_borrow_expr<'tcx>(
-visitor:&mutRegionResolutionVisitor<'tcx>,
+visitor:&mutScopeResolutionVisitor<'tcx>,
 expr:&hir::Expr<'_>,
 blk_id:Option<Scope>,
 ){
@@ -782,7 +782,7 @@ fn resolve_local<'tcx>(
 }
 }
 
-impl<'tcx>RegionResolutionVisitor<'tcx>{
+impl<'tcx>ScopeResolutionVisitor<'tcx>{
 /// Records the current parent (if any) as the parent of `child_scope`.
 /// Returns the depth of `child_scope`.
 fnrecord_child_scope(&mutself,child_scope:Scope) -> ScopeDepth{
@@ -838,7 +838,7 @@ impl<'tcx> RegionResolutionVisitor<'tcx> {
 }
 }
 
-impl<'tcx>Visitor<'tcx>forRegionResolutionVisitor<'tcx>{
+impl<'tcx>Visitor<'tcx>forScopeResolutionVisitor<'tcx>{
 fnvisit_block(&mutself,b:&'tcxBlock<'tcx>){
 resolve_block(self, b);
 }
@@ -906,6 +906,10 @@ impl<'tcx> Visitor<'tcx> for RegionResolutionVisitor<'tcx> {
 fnvisit_local(&mutself,l:&'tcxLetStmt<'tcx>){
 resolve_local(self,Some(l.pat), l.init)
 }
+fnvisit_inline_const(&mutself,c:&'tcx hir::ConstBlock){
+let body = self.tcx.hir().body(c.body);
+self.visit_body(body);
+}
 }
 
 /// Per-body `region::ScopeTree`. The `DefId` should be the owner `DefId` for the body;
@@ -922,7 +926,7 @@ pub(crate) fn region_scope_tree(tcx: TyCtxt<'_>, def_id: DefId) -> &ScopeTree {
 }
 
 let scope_tree = ifletSome(body) = tcx.hir().maybe_body_owned_by(def_id.expect_local()){
-letmut visitor = RegionResolutionVisitor{
+letmut visitor = ScopeResolutionVisitor{
  tcx,
 scope_tree:ScopeTree::default(),
 expr_and_pat_count:0,

tests/ui/inline-const/collect-scopes-in-pat.rs

@@ -0,0 +1,16 @@
+// @compile-flags: -Zlint-mir
+//@ check-pass
+
+#![feature(inline_const_pat)]
+
+fnmain(){
+match1{
+const{
+ || match0{
+ x => 0,
+};
+0
+} => (),
+ _ => (),
+}
+}