mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: only check dwarf version when emitting dwarf

Browse source
This commit is contained in:
Weihang Lo 2023-12-11 16:24:24 -05:00
parent 1667f3d2cc
commit 6aac62cdcb
No known key found for this signature in database
GPG key ID: D7DBF189825E82E7
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs
View file

@ -39,6 +39,7 @@ use rustc_span::FileName;
use rustc_span::{FileNameDisplayPreference, SourceFile}; use rustc_span::{FileNameDisplayPreference, SourceFile};
use rustc_symbol_mangling::typeid_for_trait_ref; use rustc_symbol_mangling::typeid_for_trait_ref;
use rustc_target::abi::{Align, Size}; use rustc_target::abi::{Align, Size};
use rustc_target::spec::DebuginfoKind;
use smallvec::smallvec; use smallvec::smallvec;
use libc::{c_char, c_longlong, c_uint}; use libc::{c_char, c_longlong, c_uint};
@ -881,9 +882,14 @@ pub fn build_compile_unit_di_node<'ll, 'tcx>(
let dwarf_version = let dwarf_version =
tcx.sess.opts.unstable_opts.dwarf_version.unwrap_or(tcx.sess.target.default_dwarf_version); tcx.sess.opts.unstable_opts.dwarf_version.unwrap_or(tcx.sess.target.default_dwarf_version);
let is_dwarf_kind =
matches!(tcx.sess.target.debuginfo_kind, DebuginfoKind::Dwarf | DebuginfoKind::DwarfDsym);
// Don't emit `.debug_pubnames` and `.debug_pubtypes` on DWARFv4 or lower. // Don't emit `.debug_pubnames` and `.debug_pubtypes` on DWARFv4 or lower.
let debug_name_table_kind = let debug_name_table_kind = if is_dwarf_kind && dwarf_version <= 4 {
if dwarf_version > 4 { DebugNameTableKind::Default } else { DebugNameTableKind::None }; DebugNameTableKind::None
} else {
DebugNameTableKind::Default
};
unsafe { unsafe {
let compile_unit_file = llvm::LLVMRustDIBuilderCreateFile( let compile_unit_file = llvm::LLVMRustDIBuilderCreateFile(