This is an archive of the discontinued LLVM Phabricator instance.

Differential D119310

Add support to dsymutil for dumping out new swift5 reflection sections
ClosedPublic

Authored by rastogishubham on Feb 8 2022, 9:26 PM.

Details

Reviewers
aprantl
JDevlieghere
Commits
rGa18d06a0f8ff: Add support to dsymutil for dumping out new swift5 reflection sections
Summary

This change adds support for dsymutil to be able to dump out the new swift5 reflection sections called "swift5_proto and swift5_protos". The test is also updated to check for this.

Diff Detail

Event Timeline

rastogishubham created this revision.Feb 8 2022, 9:26 PM
Herald added a reviewer: JDevlieghere. · View Herald TranscriptFeb 8 2022, 9:26 PM
rastogishubham requested review of this revision.Feb 8 2022, 9:26 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 8 2022, 9:26 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
JDevlieghere accepted this revision.Feb 8 2022, 9:33 PM

LGTM

This revision is now accepted and ready to land.Feb 8 2022, 9:33 PM
rastogishubham edited the summary of this revision. (Show Details)Feb 8 2022, 9:34 PM
rastogishubham updated this revision to Diff 407047.Feb 8 2022, 9:59 PM

I forgot to add the extra checks for the test to the diff

Harbormaster completed remote builds in B148416: Diff 407047.Feb 8 2022, 10:41 PM
aprantl accepted this revision.Feb 9 2022, 12:54 PM

LGTM with one question inline.

llvm/include/llvm/BinaryFormat/Swift.def
29

Is the protocs name one you came up with or does the Swift compiler use that too? It seems protos without the c would be closer to the actual section name, but if the Swift compiler uses protocs, we should use that here, too.

llvm/test/tools/dsymutil/X86/reflection-dump.test
47

Test looks good!

rastogishubham marked 2 inline comments as done.Feb 9 2022, 1:07 PM
rastogishubham added inline comments.
llvm/include/llvm/BinaryFormat/Swift.def
29

This is the name that was in /Users/shubham/Development/apple/swift/include/swift/ABI/ObjectFile.h I did not come up with any names myself. Just used the names that Artem came up with

This revision was landed with ongoing or failed builds.Feb 10 2022, 1:51 PM
Closed by commit rGa18d06a0f8ff: Add support to dsymutil for dumping out new swift5 reflection sections (authored by rastogishubham). · Explain Why
This revision was automatically updated to reflect the committed changes.
rastogishubham marked an inline comment as done.
rastogishubham added a commit: rGa18d06a0f8ff: Add support to dsymutil for dumping out new swift5 reflection sections.

Revision Contents

PathSize
llvm/
include/
llvm/
BinaryFormat/
4 lines
test/
tools/
dsymutil/
Inputs/
46 lines
X86/
6 lines

Diff 407672

llvm/include/llvm/BinaryFormat/Swift.def

Show All 18 Lines
#endif #endif
HANDLE_SWIFT_SECTION(fieldmd, "__swift5_fieldmd", "swift5_fieldmd", ".sw5flmd") HANDLE_SWIFT_SECTION(fieldmd, "__swift5_fieldmd", "swift5_fieldmd", ".sw5flmd")
HANDLE_SWIFT_SECTION(assocty, "__swift5_assocty", "swift5_assocty", ".sw5asty") HANDLE_SWIFT_SECTION(assocty, "__swift5_assocty", "swift5_assocty", ".sw5asty")
HANDLE_SWIFT_SECTION(builtin, "__swift5_builtin", "swift5_builtin", ".sw5bltn") HANDLE_SWIFT_SECTION(builtin, "__swift5_builtin", "swift5_builtin", ".sw5bltn")
HANDLE_SWIFT_SECTION(capture, "__swift5_capture", "swift5_capture", ".sw5cptr") HANDLE_SWIFT_SECTION(capture, "__swift5_capture", "swift5_capture", ".sw5cptr")
HANDLE_SWIFT_SECTION(typeref, "__swift5_typeref", "swift5_typeref", ".sw5tyrf") HANDLE_SWIFT_SECTION(typeref, "__swift5_typeref", "swift5_typeref", ".sw5tyrf")
HANDLE_SWIFT_SECTION(reflstr, "__swift5_reflstr", "swift5_reflstr", ".sw5rfst") HANDLE_SWIFT_SECTION(reflstr, "__swift5_reflstr", "swift5_reflstr", ".sw5rfst")
HANDLE_SWIFT_SECTION(conform, "__swift5_proto", "swift5_protocol_confromances",
".sw5prtc$B")
HANDLE_SWIFT_SECTION(protocs, "__swift5_protos", "swift5_protocols",
aprantlUnsubmitted
Done
ReplyInline Actions

Is the protocs name one you came up with or does the Swift compiler use that too? It seems protos without the c would be closer to the actual section name, but if the Swift compiler uses protocs, we should use that here, too.

aprantl: Is the `protocs` name one you came up with or does the Swift compiler use that too? It seems…
rastogishubhamAuthorUnsubmitted
Done
ReplyInline Actions

This is the name that was in /Users/shubham/Development/apple/swift/include/swift/ABI/ObjectFile.h I did not come up with any names myself. Just used the names that Artem came up with

rastogishubham: This is the name that was in /Users/shubham/Development/apple/swift/include/swift/ABI/ObjectFil…
".sw5prt$B")

llvm/test/tools/dsymutil/Inputs/reflection_metadata.yaml

Show All 10 Lines
--- !mach-o --- !mach-o
FileHeader: FileHeader:
magic: 0xFEEDFACF magic: 0xFEEDFACF
cputype: 0x1000007 cputype: 0x1000007
cpusubtype: 0x3 cpusubtype: 0x3
filetype: 0x1 filetype: 0x1
ncmds: 8 ncmds: 8
sizeofcmds: 2800 sizeofcmds: 2960
flags: 0x2000 flags: 0x2000
reserved: 0x0 reserved: 0x0
LoadCommands: LoadCommands:
- cmd: LC_SEGMENT_64 - cmd: LC_SEGMENT_64
cmdsize: 2552 cmdsize: 2712
segname: '' segname: ''
vmaddr: 0 vmaddr: 0
vmsize: 21352 vmsize: 21352
fileoff: 2832 fileoff: 2832
filesize: 20967 filesize: 20967
maxprot: 7 maxprot: 7
initprot: 7 initprot: 7
nsects: 31 nsects: 33
flags: 0 flags: 0
Sections: Sections:
- sectname: __text - sectname: __text
segname: __TEXT segname: __TEXT
addr: 0x0 addr: 0x0
size: 4571 size: 4571
offset: 0xB10 offset: 0xBB0
align: 4 align: 4
reloff: 0x5CF8 reloff: 0x5CF8
nreloc: 74 nreloc: 74
flags: 0x80000400 flags: 0x80000400
reserved1: 0x0 reserved1: 0x0
reserved2: 0x0 reserved2: 0x0
relocations: relocations:
- address: 0x11A1 - address: 0x11A1
symbolnum: 142 symbolnum: 142
pcrel: true pcrel: true
length: 2 length: 2
extern: true extern: true
type: 1 type: 1
scattered: false scattered: false
value: 0 value: 0
- sectname: __swift5_typeref - sectname: __swift5_typeref
segname: __TEXT segname: __TEXT
addr: 0x11DC addr: 0x11DC
size: 117 size: 117
offset: 0x1CEC offset: 0x1D8C
align: 1 align: 1
reloff: 0x5F48 reloff: 0x5F48
nreloc: 22 nreloc: 22
flags: 0x10000000 flags: 0x10000000
reserved1: 0x0 reserved1: 0x0
reserved2: 0x0 reserved2: 0x0
content: 7800423000005369000001FFFFFFFF002473346D61696E31304D7950726F746F636F6C50000001FFFFFFFF0001FFFFFFFF0001FFFFFFFF0001FFFFFFFF0035496E6E657201F9FFFFFF517A0001FFFFFFFF797847000001FFFFFFFF797847000001FFFFFFFF0001FFFFFFFF0001FFFFFFFF79784700 content: 7800423000005369000001FFFFFFFF002473346D61696E31304D7950726F746F636F6C50000001FFFFFFFF0001FFFFFFFF0001FFFFFFFF0001FFFFFFFF0035496E6E657201F9FFFFFF517A0001FFFFFFFF797847000001FFFFFFFF797847000001FFFFFFFF0001FFFFFFFF0001FFFFFFFF79784700
relocations: relocations:
- address: 0x6D - address: 0x6D
symbolnum: 163 symbolnum: 163
pcrel: false pcrel: false
length: 2 length: 2
extern: true extern: true
type: 0 type: 0
scattered: false scattered: false
value: 0 value: 0
- sectname: __swift5_capture - sectname: __swift5_capture
segname: __TEXT segname: __TEXT
addr: 0x1254 addr: 0x1254
size: 24 size: 24
offset: 0x1D64 offset: 0x1E04
align: 2 align: 2
reloff: 0x5FF8 reloff: 0x5FF8
nreloc: 6 nreloc: 6
flags: 0x10000000 flags: 0x10000000
reserved1: 0x0 reserved1: 0x0
reserved2: 0x0 reserved2: 0x0
content: 010000000100000002000000F4FFFFFFF0FFFFFFECFFFFFF content: 010000000100000002000000F4FFFFFFF0FFFFFFECFFFFFF
relocations: relocations:
- address: 0x14 - address: 0x14
symbolnum: 29 symbolnum: 29
pcrel: false pcrel: false
length: 3 length: 3
extern: true extern: true
type: 0 type: 0
scattered: false scattered: false
value: 0 value: 0
- sectname: __swift5_reflstr - sectname: __swift5_reflstr
segname: __TEXT segname: __TEXT
addr: 0x17D8 addr: 0x17D8
size: 37 size: 37
offset: 0x22E8 offset: 0x2388
align: 0 align: 0
reloff: 0x0 reloff: 0x0
nreloc: 0 nreloc: 0
flags: 0x10000000 flags: 0x10000000
reserved1: 0x0 reserved1: 0x0
reserved2: 0x0 reserved2: 0x0
content: 496E6E65720069006D73006D6500696E6E6572004300490074006D6773006D676500474300 content: 496E6E65720069006D73006D6500696E6E6572004300490074006D6773006D676500474300
- sectname: __swift5_assocty - sectname: __swift5_assocty
segname: __TEXT segname: __TEXT
addr: 0x1800 addr: 0x1800
size: 24 size: 24
offset: 0x2310 offset: 0x23B0
align: 2 align: 2
reloff: 0x6530 reloff: 0x6530
nreloc: 8 nreloc: 8
flags: 0x10000000 flags: 0x10000000
reserved1: 0x0 reserved1: 0x0
reserved2: 0x0 reserved2: 0x0
content: 00000000FCFFFFFF0100000008000000F0FFFFFFECFFFFFF content: 00000000FCFFFFFF0100000008000000F0FFFFFFECFFFFFF
relocations: relocations:
- address: 0x14 - address: 0x14
symbolnum: 31 symbolnum: 31
pcrel: false pcrel: false
length: 2 length: 2
extern: true extern: true
type: 5 type: 5
scattered: false scattered: false
value: 0 value: 0
- sectname: __swift5_fieldmd - sectname: __swift5_fieldmd
segname: __TEXT segname: __TEXT
addr: 0x1818 addr: 0x1818
size: 260 size: 260
offset: 0x2328 offset: 0x23C8
align: 2 align: 2
reloff: 0x6570 reloff: 0x6570
nreloc: 60 nreloc: 60
flags: 0x10000000 flags: 0x10000000
reserved1: 0x0 reserved1: 0x0
reserved2: 0x0 reserved2: 0x0
content: 000000000000000004000C0000000000000000000000000001000C000300000000000000ECFFFFFFE8FFFFFF00000000E0FFFFFFDCFFFFFF00000000D4FFFFFFD0FFFFFF000000000000000000000C000100000002000000ECFFFFFFE8FFFFFF000000000000000000000C0000000000000000000000000003000C000200000000000000ECFFFFFFE8FFFFFF00000000E0FFFFFFDCFFFFFF000000000000000001000C000400000000000000ECFFFFFFE8FFFFFF00000000E0FFFFFFDCFFFFFF00000000D4FFFFFFD0FFFFFF00000000C8FFFFFFC4FFFFFF000000000000000000000C0000000000000000000000000002000C000100000000000000ECFFFFFFE8FFFFFF content: 000000000000000004000C0000000000000000000000000001000C000300000000000000ECFFFFFFE8FFFFFF00000000E0FFFFFFDCFFFFFF00000000D4FFFFFFD0FFFFFF000000000000000000000C000100000002000000ECFFFFFFE8FFFFFF000000000000000000000C0000000000000000000000000003000C000200000000000000ECFFFFFFE8FFFFFF00000000E0FFFFFFDCFFFFFF000000000000000001000C000400000000000000ECFFFFFFE8FFFFFF00000000E0FFFFFFDCFFFFFF00000000D4FFFFFFD0FFFFFF00000000C8FFFFFFC4FFFFFF000000000000000000000C0000000000000000000000000002000C000100000000000000ECFFFFFFE8FFFFFF
relocations: relocations:
- address: 0x100 - address: 0x100
symbolnum: 71 symbolnum: 71
pcrel: false pcrel: false
length: 2 length: 2
extern: true extern: true
type: 0 type: 0
scattered: false scattered: false
value: 0 value: 0
- sectname: __swift5_builtin - sectname: __swift5_builtin
segname: __TEXT segname: __TEXT
addr: 0x1AC8 addr: 0x1AC8
size: 20 size: 20
offset: 0x25D8 offset: 0x2678
align: 2 align: 2
reloff: 0x67F8 reloff: 0x67F8
nreloc: 2 nreloc: 2
flags: 0x10000000 flags: 0x10000000
reserved1: 0x0 reserved1: 0x0
reserved2: 0x0 reserved2: 0x0
content: 00000000090000000800010010000000FE000000 content: 00000000090000000800010010000000FE000000
relocations: relocations:
- address: 0x0 - address: 0x0
symbolnum: 52 symbolnum: 52
pcrel: false pcrel: false
length: 2 length: 2
extern: true extern: true
type: 5 type: 5
scattered: false scattered: false
value: 0 value: 0
- sectname: __swift5_proto
segname: __TEXT
addr: 0x1AEC
size: 10
offset: 0x269C
align: 2
reloff: 0x0
nreloc: 0
flags: 0x10000000
reserved1: 0x0
reserved2: 0x0
content: 41424344454647484950
- sectname: __swift5_protos
segname: __TEXT
addr: 0x1AF8
size: 10
offset: 0x26C0
align: 2
reloff: 0x0
nreloc: 0
flags: 0x10000000
reserved1: 0x0
reserved2: 0x0
content: 51525354555657585960
- sectname: __bss - sectname: __bss
segname: __DATA segname: __DATA
addr: 0x3372 addr: 0x3372
size: 2084 size: 2084
offset: 0x50B0 offset: 0x5150
align: 3 align: 3
reloff: 0x0 reloff: 0x0
nreloc: 0 nreloc: 0
flags: 0x6800000B flags: 0x6800000B
reserved1: 0x0 reserved1: 0x0
reserved2: 0x0 reserved2: 0x0
relocations: relocations:
- address: 0x56 - address: 0x56
▲ Show 20 Lines • Show All 252 Lines • Show Last 20 Lines

llvm/test/tools/dsymutil/X86/reflection-dump.test

Show All 36 Lines
CHECK: Contents of section __DWARF,__swift5_capture: CHECK: Contents of section __DWARF,__swift5_capture:
CHECK-NEXT: 10000e22c 01000000 01000000 02000000 f4ffffff ................ CHECK-NEXT: 10000e22c 01000000 01000000 02000000 f4ffffff ................
CHECK-NEXT: 10000e23c f0ffffff ecffffff ........ CHECK-NEXT: 10000e23c f0ffffff ecffffff ........
CHECK: Contents of section __DWARF,__swift5_builtin: CHECK: Contents of section __DWARF,__swift5_builtin:
CHECK-NEXT: 10000e244 00000000 09000000 08000100 10000000 ................ CHECK-NEXT: 10000e244 00000000 09000000 08000100 10000000 ................
CHECK-NEXT: 10000e254 fe000000 .... CHECK-NEXT: 10000e254 fe000000 ....
CHECK: Contents of section __DWARF,__swift5_proto:
CHECK-NEXT: 10000e258 41424344 45464748 4950 ABCDEFGHIP
aprantlUnsubmitted
Done
ReplyInline Actions

Test looks good!

aprantl: Test looks good!
CHECK: Contents of section __DWARF,__swift5_protos:
CHECK-NEXT: 10000e264 51525354 55565758 5960 QRSTUVWXY`