expadn abi check + condese & fix tests

rust-lang · Feb 28, 2022 · d316aba · d316aba
1 parent bfa7d44
commit d316aba
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git 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);
 

diff --git a/src/test/ui/box/issue-78459-ice.rs b/src/test/ui/box/issue-78459-ice.rs
diff --git a/src/test/ui/box/issue-81270-ice.rs → src/test/ui/box/large-allocator-ice.rs b/src/test/ui/box/issue-81270-ice.rs → src/test/ui/box/large-allocator-ice.rs
@@ -1,4 +1,4 @@
-// check-pass
+// build-pass
 #![feature(allocator_api)]
 
 use std::alloc::Allocator;
@@ -18,5 +18,6 @@ unsafe impl Allocator for BigAllocator {
 }
 
 fn main() {
+    Box::new_in((), &std::alloc::Global);
     Box::new_in((), BigAllocator([0; 2]));
 }