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
This commit is contained in:
commit
a26e97be88
45 changed files with 3828 additions and 386 deletions
|
@ -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(),
|
||||
);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue