From aa5af2a0034b211631204218caa8f2f17ea0b0e6 Mon Sep 17 00:00:00 2001
From: Gary Guo <gary@garyguo.net>
Date: Thu, 1 Dec 2022 19:05:49 +0000
Subject: [PATCH] Allow unsafe through inline const for THIR unsafety checker

The closure handling code is changed slightly to avoid allocation
when THIR building failed.
---
 .../rustc_mir_build/src/check_unsafety.rs     | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/compiler/rustc_mir_build/src/check_unsafety.rs b/compiler/rustc_mir_build/src/check_unsafety.rs
index fb1ea9ed300..dc7f37c2566 100644
--- a/compiler/rustc_mir_build/src/check_unsafety.rs
+++ b/compiler/rustc_mir_build/src/check_unsafety.rs
@@ -408,16 +408,29 @@ impl<'a, 'tcx> Visitor<'a, 'tcx> for UnsafetyVisitor<'a, 'tcx> {
                 } else {
                     ty::WithOptConstParam::unknown(closure_id)
                 };
-                let (closure_thir, expr) = self.tcx.thir_body(closure_def).unwrap_or_else(|_| {
-                    (self.tcx.alloc_steal_thir(Thir::new()), ExprId::from_u32(0))
-                });
-                let closure_thir = &closure_thir.borrow();
-                let hir_context = self.tcx.hir().local_def_id_to_hir_id(closure_id);
-                let mut closure_visitor =
-                    UnsafetyVisitor { thir: closure_thir, hir_context, ..*self };
-                closure_visitor.visit_expr(&closure_thir[expr]);
-                // Unsafe blocks can be used in closures, make sure to take it into account
-                self.safety_context = closure_visitor.safety_context;
+                if let Ok((closure_thir, expr)) = self.tcx.thir_body(closure_def) {
+                    let closure_thir = &closure_thir.borrow();
+                    let hir_context = self.tcx.hir().local_def_id_to_hir_id(closure_id);
+                    let mut closure_visitor =
+                        UnsafetyVisitor { thir: closure_thir, hir_context, ..*self };
+                    closure_visitor.visit_expr(&closure_thir[expr]);
+                    // Unsafe blocks can be used in closures, make sure to take it into account
+                    self.safety_context = closure_visitor.safety_context;
+                }
+            }
+            ExprKind::ConstBlock { did, substs: _ } => {
+                let def_id = did.expect_local();
+                if let Ok((inner_thir, expr)) =
+                    self.tcx.thir_body(ty::WithOptConstParam::unknown(def_id))
+                {
+                    let inner_thir = &inner_thir.borrow();
+                    let hir_context = self.tcx.hir().local_def_id_to_hir_id(def_id);
+                    let mut inner_visitor =
+                        UnsafetyVisitor { thir: inner_thir, hir_context, ..*self };
+                    inner_visitor.visit_expr(&inner_thir[expr]);
+                    // Unsafe blocks can be used in inline consts, make sure to take it into account
+                    self.safety_context = inner_visitor.safety_context;
+                }
             }
             ExprKind::Field { lhs, .. } => {
                 let lhs = &self.thir[lhs];
@@ -612,8 +625,8 @@ pub fn check_unsafety<'tcx>(tcx: TyCtxt<'tcx>, def: ty::WithOptConstParam<LocalD
         return;
     }
 
-    // Closures are handled by their owner, if it has a body
-    if tcx.is_closure(def.did.to_def_id()) {
+    // Closures and inline consts are handled by their owner, if it has a body
+    if tcx.is_typeck_child(def.did.to_def_id()) {
         let hir = tcx.hir();
         let owner = hir.enclosing_body_owner(hir.local_def_id_to_hir_id(def.did));
         tcx.ensure().thir_check_unsafety(owner);