Auto merge of #117962 - weihanglo:debug-name-table, r=wesleywiser
fix: stop emitting `.debug_pubnames` and `.debug_pubtypes` A continuation of #94181. Fixes #48762 MCP can be found in <https://github.com/rust-lang/compiler-team/issues/688>. `.debug_pubnames` and `.debug_pubtypes` are poorly designed and people seldom use them. However, they take a considerable portion of size in the final binary. This tells LLVM stop emitting those sections on DWARFv4 or lower. DWARFv5 use `.debug_names` which is more concise in size and performant for name lookup. Some other no-really-useful personal notes: <details><summary>Details</summary> <p> ## Pepole saying they are not useful * https://github.com/rust-lang/rust/issues/48762 * https://rust-lang.zulipchat.com/#narrow/stream/317568-t-compiler.2Fwg-debugging/topic/investigating.20debuginfo.20size/near/342713604 * `DwarfCompileUnit::hasDwarfPubSections()` —f633f325a1/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (L1477-L1494)
* clang default to no debug name table when no option provided —f633f325a1/clang/lib/Frontend/CompilerInvocation.cpp (L1819-L1824)
* GCC explicitly says GDB doesn't use pub sections (`TARGET_WANT_DEBUG_PUB_SECTIONS` only be true on Darwin) —5d2a360f0a/gcc/target.def (L6985-L6990)
and319b460545/gold/dwarf_reader.h (L424-L427)
* Probably the only place that makes use of pub section in lldb —725115d7bb/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp (L2117-L2135)
* "The -gsplit-dwarf option requires -ggnu-pubnames." —5d2a360f0a/gcc/opts.cc (L1205)
* LLVM: Always emit `.debug_names` with dwarf 5 for Apple platforms — https://reviews.llvm.org/D118754 </p> </details>
This commit is contained in:
commit
e2a3c9b3f0
5 changed files with 73 additions and 3 deletions
|
@ -17,6 +17,7 @@ use crate::debuginfo::utils::FatPtrKind;
|
|||
use crate::llvm;
|
||||
use crate::llvm::debuginfo::{
|
||||
DIDescriptor, DIFile, DIFlags, DILexicalBlock, DIScope, DIType, DebugEmissionKind,
|
||||
DebugNameTableKind,
|
||||
};
|
||||
use crate::value::Value;
|
||||
|
||||
|
@ -38,6 +39,7 @@ use rustc_span::FileName;
|
|||
use rustc_span::{FileNameDisplayPreference, SourceFile};
|
||||
use rustc_symbol_mangling::typeid_for_trait_ref;
|
||||
use rustc_target::abi::{Align, Size};
|
||||
use rustc_target::spec::DebuginfoKind;
|
||||
use smallvec::smallvec;
|
||||
|
||||
use libc::{c_char, c_longlong, c_uint};
|
||||
|
@ -878,6 +880,17 @@ pub fn build_compile_unit_di_node<'ll, 'tcx>(
|
|||
let split_name = split_name.to_str().unwrap();
|
||||
let kind = DebugEmissionKind::from_generic(tcx.sess.opts.debuginfo);
|
||||
|
||||
let 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.
|
||||
let debug_name_table_kind = if is_dwarf_kind && dwarf_version <= 4 {
|
||||
DebugNameTableKind::None
|
||||
} else {
|
||||
DebugNameTableKind::Default
|
||||
};
|
||||
|
||||
unsafe {
|
||||
let compile_unit_file = llvm::LLVMRustDIBuilderCreateFile(
|
||||
debug_context.builder,
|
||||
|
@ -907,6 +920,7 @@ pub fn build_compile_unit_di_node<'ll, 'tcx>(
|
|||
kind,
|
||||
0,
|
||||
tcx.sess.opts.unstable_opts.split_dwarf_inlining,
|
||||
debug_name_table_kind,
|
||||
);
|
||||
|
||||
if tcx.sess.opts.unstable_opts.profile {
|
||||
|
|
|
@ -5,7 +5,7 @@ use super::debuginfo::{
|
|||
DIArray, DIBasicType, DIBuilder, DICompositeType, DIDerivedType, DIDescriptor, DIEnumerator,
|
||||
DIFile, DIFlags, DIGlobalVariableExpression, DILexicalBlock, DILocation, DINameSpace,
|
||||
DISPFlags, DIScope, DISubprogram, DISubrange, DITemplateTypeParameter, DIType, DIVariable,
|
||||
DebugEmissionKind,
|
||||
DebugEmissionKind, DebugNameTableKind,
|
||||
};
|
||||
|
||||
use libc::{c_char, c_int, c_uint, size_t};
|
||||
|
@ -794,6 +794,15 @@ pub mod debuginfo {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// LLVMRustDebugNameTableKind
|
||||
#[derive(Clone, Copy)]
|
||||
#[repr(C)]
|
||||
pub enum DebugNameTableKind {
|
||||
Default,
|
||||
Gnu,
|
||||
None,
|
||||
}
|
||||
}
|
||||
|
||||
use bitflags::bitflags;
|
||||
|
@ -1812,6 +1821,7 @@ extern "C" {
|
|||
kind: DebugEmissionKind,
|
||||
DWOId: u64,
|
||||
SplitDebugInlining: bool,
|
||||
DebugNameTableKind: DebugNameTableKind,
|
||||
) -> &'a DIDescriptor;
|
||||
|
||||
pub fn LLVMRustDIBuilderCreateFile<'a>(
|
||||
|
|
|
@ -697,6 +697,25 @@ static DICompileUnit::DebugEmissionKind fromRust(LLVMRustDebugEmissionKind Kind)
|
|||
}
|
||||
}
|
||||
|
||||
enum class LLVMRustDebugNameTableKind {
|
||||
Default,
|
||||
GNU,
|
||||
None,
|
||||
};
|
||||
|
||||
static DICompileUnit::DebugNameTableKind fromRust(LLVMRustDebugNameTableKind Kind) {
|
||||
switch (Kind) {
|
||||
case LLVMRustDebugNameTableKind::Default:
|
||||
return DICompileUnit::DebugNameTableKind::Default;
|
||||
case LLVMRustDebugNameTableKind::GNU:
|
||||
return DICompileUnit::DebugNameTableKind::GNU;
|
||||
case LLVMRustDebugNameTableKind::None:
|
||||
return DICompileUnit::DebugNameTableKind::None;
|
||||
default:
|
||||
report_fatal_error("bad DebugNameTableKind.");
|
||||
}
|
||||
}
|
||||
|
||||
enum class LLVMRustChecksumKind {
|
||||
None,
|
||||
MD5,
|
||||
|
@ -765,13 +784,15 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateCompileUnit(
|
|||
const char *Flags, unsigned RuntimeVer,
|
||||
const char *SplitName, size_t SplitNameLen,
|
||||
LLVMRustDebugEmissionKind Kind,
|
||||
uint64_t DWOId, bool SplitDebugInlining) {
|
||||
uint64_t DWOId, bool SplitDebugInlining,
|
||||
LLVMRustDebugNameTableKind TableKind) {
|
||||
auto *File = unwrapDI<DIFile>(FileRef);
|
||||
|
||||
return wrap(Builder->createCompileUnit(Lang, File, StringRef(Producer, ProducerLen),
|
||||
isOptimized, Flags, RuntimeVer,
|
||||
StringRef(SplitName, SplitNameLen),
|
||||
fromRust(Kind), DWOId, SplitDebugInlining));
|
||||
fromRust(Kind), DWOId, SplitDebugInlining,
|
||||
false, fromRust(TableKind)));
|
||||
}
|
||||
|
||||
extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateFile(
|
||||
|
|
24
tests/assembly/dwarf4.rs
Normal file
24
tests/assembly/dwarf4.rs
Normal file
|
@ -0,0 +1,24 @@
|
|||
// Makes sure that `-Z dwarf-version=4` causes `rustc` to emit DWARF version 4.
|
||||
// assembly-output: emit-asm
|
||||
// compile-flags: -g --target x86_64-unknown-linux-gnu -Z dwarf-version=4 -Copt-level=0
|
||||
// needs-llvm-components: x86
|
||||
|
||||
#![feature(no_core, lang_items)]
|
||||
#![crate_type = "rlib"]
|
||||
#![no_core]
|
||||
|
||||
#[lang = "sized"]
|
||||
trait Sized {}
|
||||
#[lang = "copy"]
|
||||
trait Copy {}
|
||||
|
||||
pub fn wibble() {}
|
||||
|
||||
pub struct X;
|
||||
|
||||
// CHECK: .section .debug_info
|
||||
// CHECK-NOT: .short 2
|
||||
// CHECK-NOT: .short 5
|
||||
// CHECK: .short 4
|
||||
// CHECK-NOT: .section .debug_pubnames
|
||||
// CHECK-NOT: .section .debug_pubtypes
|
|
@ -18,3 +18,4 @@ pub fn wibble() {}
|
|||
// CHECK-NOT: .short 2
|
||||
// CHECK-NOT: .short 4
|
||||
// CHECK: .short 5
|
||||
// CHECK: .section .debug_names
|
||||
|
|
Loading…
Add table
Reference in a new issue