diff options
| author | bors <bors@rust-lang.org> | 2024-09-01 09:18:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-01 09:18:49 +0000 |
| commit | 3c0996b2fa1c0adc8cdffe2cc7a9d97eeaf11dc5 (patch) | |
| tree | 768c0244df33445c56a1fd63b8639818c3b4a3c0 /compiler/rustc_codegen_llvm/src | |
| parent | f03c7b21700478c6c2b335b37caba72c3a06e447 (diff) | |
| parent | 53451c2b76169532d5398614c5778c7bc4f68985 (diff) | |
| download | rust-3c0996b2fa1c0adc8cdffe2cc7a9d97eeaf11dc5.tar.gz rust-3c0996b2fa1c0adc8cdffe2cc7a9d97eeaf11dc5.zip | |
Auto merge of #3854 - rust-lang:rustup-2024-09-01, r=RalfJung
Automatic Rustup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs index dc59e9349b0..17a9630c655 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs @@ -216,6 +216,8 @@ fn build_pointer_or_reference_di_node<'ll, 'tcx>( // need to make sure that we don't break existing debuginfo consumers // by doing that (at least not without a warning period). let layout_type = if ptr_type.is_box() { + // The assertion at the start of this function ensures we have a ZST allocator. + // We'll make debuginfo "skip" all ZST allocators, not just the default allocator. Ty::new_mut_ptr(cx.tcx, pointee_type) } else { ptr_type |