diff options
| author | bors <bors@rust-lang.org> | 2022-06-08 13:20:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-08 13:20:45 +0000 |
| commit | 09d52bc5d4260bac8b9a2ea8ac7a07c5c72906f1 (patch) | |
| tree | 94ea59007c6081c8fdd79f76d400735f6bd45a1d /compiler/rustc_codegen_llvm/src | |
| parent | 1a97162cb245b5e2c7458c28859e3df779908c02 (diff) | |
| parent | 5d1a3669ee3e18fe7bcac455dc880861a73ff84b (diff) | |
| download | rust-09d52bc5d4260bac8b9a2ea8ac7a07c5c72906f1.tar.gz rust-09d52bc5d4260bac8b9a2ea8ac7a07c5c72906f1.zip | |
Auto merge of #97873 - Dylan-DPC:rollup-g6ptsdq, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #97276 (Stabilize `const_intrinsic_copy`) - #97763 (Allow ptr_from_addr_cast to fail) - #97846 (Specify DWARF alignment in bits, not bytes.) - #97848 (Impl Traits lowering minor refactors) - #97865 (remove `BorrowckMode`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs index dd3adbf70a6..f5cbbc7ca91 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs @@ -1365,7 +1365,7 @@ pub fn build_global_var_di_node<'ll>(cx: &CodegenCx<'ll, '_>, def_id: DefId, glo is_local_to_unit, global, None, - global_align.bytes() as u32, + global_align.bits() as u32, ); } } |