This is an archive of the discontinued LLVM Phabricator instance.

Differential D90433

[dwarfdump] Recognize __apple sections as debug info sections
ClosedPublic

Authored by JDevlieghere on Oct 29 2020, 3:09 PM.

Details

Reviewers
djtodoro
aprantl
jhenderson
Commits
rGdb3dba52caa8: [dwarfdump] Recognize __apple sections as debug info sections
Summary

Recognize the __apple_ sections as debug info sections and make sure they're included in the --show-sections-sizes output.

Diff Detail

Event Timeline

JDevlieghere created this revision.Oct 29 2020, 3:09 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 29 2020, 3:09 PM
Herald added subscribers: cmtice, hiraditya. · View Herald Transcript
JDevlieghere requested review of this revision.Oct 29 2020, 3:09 PM
Herald added a subscriber: MaskRay. · View Herald TranscriptOct 29 2020, 3:09 PM
JDevlieghere updated this revision to Diff 301771.Oct 29 2020, 3:09 PM
djtodoro accepted this revision.Oct 29 2020, 3:46 PM

lgtm, thanks.

This revision is now accepted and ready to land.Oct 29 2020, 3:46 PM
Closed by commit rGdb3dba52caa8: [dwarfdump] Recognize __apple sections as debug info sections (authored by JDevlieghere). · Explain WhyOct 29 2020, 5:54 PM
This revision was automatically updated to reflect the committed changes.
JDevlieghere added a commit: rGdb3dba52caa8: [dwarfdump] Recognize __apple sections as debug info sections.
aprantl added a comment.Oct 30 2020, 9:09 AM

Nice!

aprantl added a comment.Oct 30 2020, 9:09 AM

Should we add __swift_ast, too?

JDevlieghere added a comment.Nov 2 2020, 2:56 PM
In D90433#2364838, @aprantl wrote:

Should we add __swift_ast, too?

Good point. Fixed in db3dba52caa8cd8bb37fa1c7cd2a0bc1ddb214eb

Revision Contents

PathSize
llvm/
lib/
Object/
3 lines
test/
tools/
llvm-dwarfdump/
X86/
223 lines
4 lines

Diff 301799

llvm/lib/Object/MachOObjectFile.cpp

Show First 20 Lines • Show All 2,026 Lines • ▼ Show 20 Linesbool MachOObjectFile::isSectionBSS(DataRefImpl Sec) const {
unsigned SectionType = Flags & MachO::SECTION_TYPE; unsigned SectionType = Flags & MachO::SECTION_TYPE;
return !(Flags & MachO::S_ATTR_PURE_INSTRUCTIONS) && return !(Flags & MachO::S_ATTR_PURE_INSTRUCTIONS) &&
(SectionType == MachO::S_ZEROFILL || (SectionType == MachO::S_ZEROFILL ||
SectionType == MachO::S_GB_ZEROFILL); SectionType == MachO::S_GB_ZEROFILL);
} }
bool MachOObjectFile::isDebugSection(StringRef SectionName) const { bool MachOObjectFile::isDebugSection(StringRef SectionName) const {
return SectionName.startswith("__debug") || return SectionName.startswith("__debug") ||
SectionName.startswith("__zdebug") || SectionName == "__gdb_index"; SectionName.startswith("__zdebug") ||
SectionName.startswith("__apple") || SectionName == "__gdb_index";
} }
unsigned MachOObjectFile::getSectionID(SectionRef Sec) const { unsigned MachOObjectFile::getSectionID(SectionRef Sec) const {
return Sec.getRawDataRefImpl().d.a; return Sec.getRawDataRefImpl().d.a;
} }
bool MachOObjectFile::isSectionVirtual(DataRefImpl Sec) const { bool MachOObjectFile::isSectionVirtual(DataRefImpl Sec) const {
uint32_t Flags = getSectionFlags(*this, Sec); uint32_t Flags = getSectionFlags(*this, Sec);
▲ Show 20 Lines • Show All 2,604 Lines • Show Last 20 Lines

llvm/test/tools/llvm-dwarfdump/X86/section_sizes_macho.test

## Check how llvm-dwarfdump calculates section sizes ## Check how llvm-dwarfdump calculates section sizes
## with --show-section-sizes for Mach-O objects. ## with --show-section-sizes for Mach-O objects.
# RUN: yaml2obj %s | llvm-dwarfdump - --show-section-sizes \ # RUN: yaml2obj %s | llvm-dwarfdump - --show-section-sizes \
# RUN: | FileCheck %s --match-full-lines --strict-whitespace # RUN: | FileCheck %s --match-full-lines --strict-whitespace
# CHECK:---------------------------------------------------- # CHECK:----------------------------------------------------
# CHECK-NEXT:file: {{.*}} # CHECK-NEXT:file: {{.*}}
# CHECK-NEXT:---------------------------------------------------- # CHECK-NEXT:----------------------------------------------------
# CHECK-NEXT:SECTION SIZE (b) # CHECK-NEXT:SECTION SIZE (b)
# CHECK-NEXT:------------ -------- # CHECK-NEXT:---------------- --------
# CHECK-NEXT:__debug_info 4 (0.93%) # CHECK-NEXT:__debug_info 83 (4.43%)
# CHECK-NEXT:__apple_names 60 (3.21%)
# CHECK-NEXT:__apple_types 71 (3.79%)
# CHECK-NEXT:__debug_abbrev 58 (3.10%)
# CHECK-NEXT:__apple_namespac 36 (1.92%)
# CHECK-NEXT:__debug_line 61 (3.26%)
# CHECK-NEXT:__debug_str 183 (9.78%)
# CHECK-NEXT:__apple_objc 36 (1.92%)
# CHECK-EMPTY: # CHECK-EMPTY:
# CHECK-NEXT: Total Size: 4 (0.93%) # CHECK-NEXT: Total Size: 588 (31.41%)
# CHECK-NEXT: Total File Size: 432 # CHECK-NEXT: Total File Size: 1872
# CHECK-NEXT:---------------------------------------------------- # CHECK-NEXT:----------------------------------------------------
--- !mach-o --- !mach-o
FileHeader: FileHeader:
magic: 0xFEEDFACF magic: 0xFEEDFACF
cputype: 0x01000007 cputype: 0x01000007
cpusubtype: 0x00000003 cpusubtype: 0x00000003
filetype: 0x00000001 filetype: 0x00000001
ncmds: 4 ncmds: 4
sizeofcmds: 360 sizeofcmds: 1080
flags: 0x00002000 flags: 0x00002000
reserved: 0x00000000 reserved: 0x00000000
LoadCommands: LoadCommands:
- cmd: LC_SEGMENT_64 - cmd: LC_SEGMENT_64
cmdsize: 232 cmdsize: 952
segname: '' segname: ''
vmaddr: 0 vmaddr: 0
vmsize: 4 vmsize: 701
fileoff: 392 fileoff: 1112
filesize: 0 filesize: 701
maxprot: 7 maxprot: 7
initprot: 7 initprot: 7
nsects: 2 nsects: 11
flags: 0 flags: 0
Sections: Sections:
## This is a debug section following the ELF naming style, and is used ## This is a debug section following the ELF naming style, and is used
## to show that such sections are not included in the report. ## to show that such sections are not included in the report.
- sectname: .debug_line - sectname: .debug_line
segname: __DWARF segname: __DWARF
addr: 0x0000000000000000 addr: 0x0000000000000000
size: 0 size: 15
offset: 0x00000188 offset: 0x00000458
align: 4
reloff: 0x00000000
nreloc: 0
flags: 0x80000400
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
content: 554889E531C0C745FC000000005DC3
- sectname: __debug_str
segname: __DWARF
addr: 0x000000000000000F
size: 183
offset: 0x00000467
align: 0
reloff: 0x00000000
nreloc: 0
flags: 0x02000000
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
- sectname: __debug_abbrev
segname: __DWARF
addr: 0x00000000000000C6
size: 58
offset: 0x0000051E
align: 0 align: 0
reloff: 0x00000000 reloff: 0x00000000
nreloc: 0 nreloc: 0
flags: 0x80000000 flags: 0x02000000
reserved1: 0x00000000 reserved1: 0x00000000
reserved2: 0x00000000 reserved2: 0x00000000
reserved3: 0x00000000 reserved3: 0x00000000
content: ''
- sectname: __debug_info - sectname: __debug_info
segname: __DWARF segname: __DWARF
addr: 0x0000000000000000 addr: 0x0000000000000100
size: 4 size: 83
offset: 0x00000000 offset: 0x00000558
align: 2 align: 0
reloff: 0x00000718
nreloc: 2
flags: 0x02000000
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
relocations:
- address: 0x00000033
symbolnum: 1
pcrel: false
length: 3
extern: false
type: 0
scattered: false
value: 0
- address: 0x00000026
symbolnum: 1
pcrel: false
length: 3
extern: false
type: 0
scattered: false
value: 0
- sectname: __apple_names
segname: __DWARF
addr: 0x0000000000000153
size: 60
offset: 0x000005AB
align: 0
reloff: 0x00000000
nreloc: 0
flags: 0x02000000
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
content: 485341480100000001000000010000000C000000000000000100000001000600000000006A7F9A7C2C000000AE000000010000003200000000000000
- sectname: __apple_objc
segname: __DWARF
addr: 0x000000000000018F
size: 36
offset: 0x000005E7
align: 0
reloff: 0x00000000 reloff: 0x00000000
nreloc: 0 nreloc: 0
flags: 0x00000001 flags: 0x02000000
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
content: 485341480100000001000000000000000C000000000000000100000001000600FFFFFFFF
- sectname: __apple_namespac
segname: __DWARF
addr: 0x00000000000001B3
size: 36
offset: 0x0000060B
align: 0
reloff: 0x00000000
nreloc: 0
flags: 0x02000000
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
content: 485341480100000001000000000000000C000000000000000100000001000600FFFFFFFF
- sectname: __apple_types
segname: __DWARF
addr: 0x00000000000001D7
size: 71
offset: 0x0000062F
align: 0
reloff: 0x00000000
nreloc: 0
flags: 0x02000000
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
content: 48534148010000000100000001000000140000000000000003000000010006000300050004000B00000000003080880B34000000B3000000010000004B00000024000000000000
- sectname: __compact_unwind
segname: __LD
addr: 0x0000000000000220
size: 32
offset: 0x00000678
align: 3
reloff: 0x00000728
nreloc: 1
flags: 0x02000000
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
content: 00000000000000000F0000000000000100000000000000000000000000000000
relocations:
- address: 0x00000000
symbolnum: 1
pcrel: false
length: 3
extern: false
type: 0
scattered: false
value: 0
- sectname: __eh_frame
segname: __TEXT
addr: 0x0000000000000240
size: 64
offset: 0x00000698
align: 3
reloff: 0x00000000
nreloc: 0
flags: 0x6800000B
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
content: 1400000000000000017A520001781001100C070890010000240000001C000000A0FDFFFFFFFFFFFF0F0000000000000000410E108602430D0600000000000000
- sectname: __debug_line
segname: __DWARF
addr: 0x0000000000000280
size: 61
offset: 0x000006D8
align: 0
reloff: 0x00000730
nreloc: 1
flags: 0x02000000
reserved1: 0x00000000 reserved1: 0x00000000
reserved2: 0x00000000 reserved2: 0x00000000
reserved3: 0x00000000 reserved3: 0x00000000
relocations:
- address: 0x0000002B
symbolnum: 1
pcrel: false
length: 3
extern: false
type: 0
scattered: false
value: 0
- cmd: LC_BUILD_VERSION - cmd: LC_BUILD_VERSION
cmdsize: 24 cmdsize: 24
platform: 1 platform: 1
minos: 658944 minos: 720896
sdk: 658944 sdk: 720896
ntools: 0 ntools: 0
- cmd: LC_SYMTAB - cmd: LC_SYMTAB
cmdsize: 24 cmdsize: 24
symoff: 392 symoff: 1848
nsyms: 2 nsyms: 1
stroff: 424 stroff: 1864
strsize: 8 strsize: 8
- cmd: LC_DYSYMTAB - cmd: LC_DYSYMTAB
cmdsize: 80 cmdsize: 80
ilocalsym: 0 ilocalsym: 0
nlocalsym: 1 nlocalsym: 0
iextdefsym: 1 iextdefsym: 0
nextdefsym: 0 nextdefsym: 1
iundefsym: 1 iundefsym: 1
nundefsym: 1 nundefsym: 0
tocoff: 0 tocoff: 0
ntoc: 0 ntoc: 0
modtaboff: 0 modtaboff: 0
nmodtab: 0 nmodtab: 0
extrefsymoff: 0 extrefsymoff: 0
nextrefsyms: 0 nextrefsyms: 0
indirectsymoff: 0 indirectsymoff: 0
nindirectsyms: 0 nindirectsyms: 0
extreloff: 0 extreloff: 0
nextrel: 0 nextrel: 0
locreloff: 0 locreloff: 0
nlocrel: 0 nlocrel: 0
LinkEditData: LinkEditData:
NameList:
- n_strx: 1
n_type: 0x0F
n_sect: 1
n_desc: 0
n_value: 0
StringTable: StringTable:
- '' - ''
- _b - _main
- _a
- '' - ''
... ...

llvm/test/tools/llvm-dwarfdump/X86/statistics.ll

Show First 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
; must be below 100%. ; must be below 100%.
; CHECK-NOT: "sum_all_local_vars(#bytes in parent scope covered by DW_AT_location)": 0, ; CHECK-NOT: "sum_all_local_vars(#bytes in parent scope covered by DW_AT_location)": 0,
; CHECK-NOT: "sum_all_local_vars(#bytes in parent scope covered by DW_AT_location)": [[BYTES]] ; CHECK-NOT: "sum_all_local_vars(#bytes in parent scope covered by DW_AT_location)": [[BYTES]]
; CHECK: "sum_all_local_vars(#bytes in parent scope covered by DW_AT_location)": ; CHECK: "sum_all_local_vars(#bytes in parent scope covered by DW_AT_location)":
; CHECK: "#bytes within functions": [[FUNCSIZE:[0-9]+]] ; CHECK: "#bytes within functions": [[FUNCSIZE:[0-9]+]]
; CHECK: "#bytes within inlined functions": [[INLINESIZE:[0-9]+]] ; CHECK: "#bytes within inlined functions": [[INLINESIZE:[0-9]+]]
; CHECK: "#bytes in __debug_info": 459, ; CHECK: "#bytes in __debug_info": 459,
; CHECK-NEXT: "#bytes in __debug_loc": 35, ; CHECK-NEXT: "#bytes in __debug_loc": 35,
; CHECK-NEXT: "#bytes in __apple_names": 348,
; CHECK-NEXT: "#bytes in __apple_types": 133,
; CHECK-NEXT: "#bytes in __debug_abbrev": 384, ; CHECK-NEXT: "#bytes in __debug_abbrev": 384,
; CHECK-NEXT: "#bytes in __apple_namespac": 60,
; CHECK-NEXT: "#bytes in __debug_line": 126, ; CHECK-NEXT: "#bytes in __debug_line": 126,
; CHECK-NEXT: "#bytes in __debug_str": 231, ; CHECK-NEXT: "#bytes in __debug_str": 231,
; CHECK-NEXT: "#bytes in __apple_objc": 36,
; ModuleID = '/tmp/quality.cpp' ; ModuleID = '/tmp/quality.cpp'
source_filename = "/tmp/quality.cpp" source_filename = "/tmp/quality.cpp"
target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-apple-macosx10.12.0" target triple = "x86_64-apple-macosx10.12.0"
%struct.S = type { i8 (i32)* } %struct.S = type { i8 (i32)* }
▲ Show 20 Lines • Show All 148 Lines • Show Last 20 Lines