From d316aba04c4644093ba07d1ec8d334b599b8eb01 Mon Sep 17 00:00:00 2001
From: DrMeepster <19316085+DrMeepster@users.noreply.github.com>
Date: Sun, 27 Feb 2022 20:25:16 -0800
Subject: expadn abi check + condese & fix tests

---
 compiler/rustc_codegen_ssa/src/mir/place.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'compiler/rustc_codegen_ssa/src')

diff --git a/compiler/rustc_codegen_ssa/src/mir/place.rs b/compiler/rustc_codegen_ssa/src/mir/place.rs
index aee385ab050..809d6447908 100644
--- a/compiler/rustc_codegen_ssa/src/mir/place.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/place.rs
@@ -456,7 +456,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                 mir::ProjectionElem::Deref => {
                     // custom allocators can change box's abi, making it unable to be derefed directly
                     if cg_base.layout.ty.is_box()
-                        && matches!(cg_base.layout.abi, Abi::Aggregate { .. })
+                        && matches!(cg_base.layout.abi, Abi::Aggregate { .. } | Abi::Uninhabited)
                     {
                         let ptr = cg_base.project_field(bx, 0).project_field(bx, 0);
 
-- 
cgit 1.4.1-3-g733a5