diff options
| author | Michael Goulet <michael@errs.io> | 2022-03-07 23:06:59 -0800 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2022-03-07 23:06:59 -0800 |
| commit | 307ee94a8a535019feadf69ce4258cdfb67a3a1c (patch) | |
| tree | bd7bbaa029de33dee460017726a9d733edafe63d /compiler/rustc_codegen_llvm | |
| parent | 67b3e8183830c7af4e06a9aa91de4d1be3c860f7 (diff) | |
| download | rust-307ee94a8a535019feadf69ce4258cdfb67a3a1c.tar.gz rust-307ee94a8a535019feadf69ce4258cdfb67a3a1c.zip | |
only emit pointer-like metadata for BZST-allocator Box
Diffstat (limited to 'compiler/rustc_codegen_llvm')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs index 89fc8980037..a6e4878e5b3 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs @@ -617,7 +617,9 @@ pub fn type_metadata<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>, t: Ty<'tcx>) -> &'ll ty::RawPtr(ty::TypeAndMut { ty: pointee_type, .. }) | ty::Ref(_, pointee_type, _) => { pointer_or_reference_metadata(cx, t, pointee_type, unique_type_id) } - ty::Adt(def, _) if def.is_box() => { + // Box<T, A> may have a non-ZST allocator A. In that case, we + // cannot treat Box<T, A> as just an owned alias of `*mut T`. + ty::Adt(def, substs) if def.is_box() && cx.layout_of(substs.type_at(1)).is_zst() => { pointer_or_reference_metadata(cx, t, t.boxed_ty(), unique_type_id) } ty::FnDef(..) | ty::FnPtr(_) => subroutine_type_metadata(cx, unique_type_id), |
