diff options
| author | bors <bors@rust-lang.org> | 2025-02-09 12:54:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-02-09 12:54:26 +0000 |
| commit | a26e97be8826d408309fffbd8168362365719f50 (patch) | |
| tree | 6338d193659cbf549cbd09e6f0ced8a9feb1a5c3 /compiler/rustc_codegen_llvm/src/debuginfo | |
| parent | 1ff21350fdc967393243227c88dddb5def8717b2 (diff) | |
| parent | 5ec56e5fbbbef22be73a469ec5467714391f8a67 (diff) | |
| download | rust-a26e97be8826d408309fffbd8168362365719f50.tar.gz rust-a26e97be8826d408309fffbd8168362365719f50.zip | |
Auto merge of #136754 - Urgau:rollup-qlkhjqr, r=Urgau
Rollup of 5 pull requests Successful merges: - #134679 (Windows: remove readonly files) - #136213 (Allow Rust to use a number of libc filesystem calls) - #136530 (Implement `x perf` directly in bootstrap) - #136601 (Detect (non-raw) borrows of null ZST pointers in CheckNull) - #136659 (Pick the max DWARF version when LTO'ing modules with different versions ) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/debuginfo')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/mod.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs b/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs index 19fb2754571..b83b937646f 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs @@ -97,7 +97,11 @@ impl<'ll, 'tcx> CodegenUnitDebugContext<'ll, 'tcx> { // Android has the same issue (#22398) llvm::add_module_flag_u32( self.llmod, - llvm::ModuleFlagMergeBehavior::Warning, + // In the case where multiple CGUs with different dwarf version + // values are being merged together, such as with cross-crate + // LTO, then we want to use the highest version of dwarf + // we can. This matches Clang's behavior as well. + llvm::ModuleFlagMergeBehavior::Max, "Dwarf Version", sess.dwarf_version(), ); |