This is an archive of the discontinued LLVM Phabricator instance.

Differential D44991

Show alignment 0 as alignment 1 in the map file.
ClosedPublic

Authored by ruiu on Mar 28 2018, 11:30 AM.

Details

Reviewers
grimar
• espindola
Commits
rG5a9529f4a299: Do not show alignment 0 because that is equivalent to 1.
rLLD329233: Do not show alignment 0 because that is equivalent to 1.
rL329233: Do not show alignment 0 because that is equivalent to 1.
Summary

Show alignment 0 as alignment 1 in the map file.

Diff Detail

Event Timeline

ruiu created this revision.Mar 28 2018, 11:30 AM
Herald added subscribers: arichardson, emaste. · View Herald TranscriptMar 28 2018, 11:30 AM
Harbormaster completed remote builds in B16502: Diff 140113.Mar 28 2018, 11:33 AM
ruiu updated this revision to Diff 140115.Mar 28 2018, 11:49 AM
  • update the logic
Harbormaster completed remote builds in B16503: Diff 140115.Mar 28 2018, 11:50 AM
grimar accepted this revision.Mar 29 2018, 1:11 AM

LGTM

This revision is now accepted and ready to land.Mar 29 2018, 1:11 AM
Closed by commit rL329233: Do not show alignment 0 because that is equivalent to 1. (authored by ruiu). · Explain WhyApr 4 2018, 2:28 PM
This revision was automatically updated to reflect the committed changes.
Herald added a reviewer: • espindola. · View Herald TranscriptApr 4 2018, 2:28 PM

Revision Contents

PathSize
lld/
ELF/
5 lines
test/
ELF/
32 lines

Diff 140113

lld/ELF/MapFile.cpp

Show All 40 Lines
typedef DenseMap<const SectionBase *, SmallVector<Symbol *, 4>> SymbolMapTy; typedef DenseMap<const SectionBase *, SmallVector<Symbol *, 4>> SymbolMapTy;
static const std::string Indent8 = " "; // 8 spaces static const std::string Indent8 = " "; // 8 spaces
static const std::string Indent16 = " "; // 16 spaces static const std::string Indent16 = " "; // 16 spaces
// Print out the first three columns of a line. // Print out the first three columns of a line.
static void writeHeader(raw_ostream &OS, uint64_t Addr, uint64_t Size, static void writeHeader(raw_ostream &OS, uint64_t Addr, uint64_t Size,
uint64_t Align) { uint64_t Align) {
// Alignment 0 is a special value and is equivalent to 1.
// Canonicalize it for the convenience of interpreting the map file.
if (Align == 0)
Align = 1;
int W = Config->Is64 ? 16 : 8; int W = Config->Is64 ? 16 : 8;
OS << format("%0*llx %0*llx %5lld ", W, Addr, W, Size, Align); OS << format("%0*llx %0*llx %5lld ", W, Addr, W, Size, Align);
} }
// Returns a list of all symbols that we want to print out. // Returns a list of all symbols that we want to print out.
static std::vector<Symbol *> getSymbols() { static std::vector<Symbol *> getSymbols() {
std::vector<Symbol *> V; std::vector<Symbol *> V;
for (InputFile *File : ObjectFiles) { for (InputFile *File : ObjectFiles) {
▲ Show 20 Lines • Show All 200 Lines • Show Last 20 Lines

lld/test/ELF/map-file.s

Show First 20 Lines • Show All 48 Lines • ▼ Show 20 Lines
// CHECK-NEXT: 000000000020026c 0000000000000030 4 <internal>:(.hash) // CHECK-NEXT: 000000000020026c 0000000000000030 4 <internal>:(.hash)
// CHECK-NEXT: 000000000020029c 0000000000000031 1 .dynstr // CHECK-NEXT: 000000000020029c 0000000000000031 1 .dynstr
// CHECK-NEXT: 000000000020029c 0000000000000031 1 <internal>:(.dynstr) // CHECK-NEXT: 000000000020029c 0000000000000031 1 <internal>:(.dynstr)
// CHECK-NEXT: 00000000002002d0 0000000000000030 8 .rela.dyn // CHECK-NEXT: 00000000002002d0 0000000000000030 8 .rela.dyn
// CHECK-NEXT: 00000000002002d0 0000000000000030 8 <internal>:(.rela.dyn) // CHECK-NEXT: 00000000002002d0 0000000000000030 8 <internal>:(.rela.dyn)
// CHECK-NEXT: 0000000000200300 0000000000000030 8 .rela.plt // CHECK-NEXT: 0000000000200300 0000000000000030 8 .rela.plt
// CHECK-NEXT: 0000000000200300 0000000000000030 8 <internal>:(.rela.plt) // CHECK-NEXT: 0000000000200300 0000000000000030 8 <internal>:(.rela.plt)
// CHECK-NEXT: 0000000000200330 0000000000000060 8 .eh_frame // CHECK-NEXT: 0000000000200330 0000000000000060 8 .eh_frame
// CHECK-NEXT: 0000000000200330 000000000000002c 0 {{.*}}{{/|\\}}map-file.s.tmp1.o:(.eh_frame+0x0) // CHECK-NEXT: 0000000000200330 000000000000002c 1 {{.*}}{{/|\\}}map-file.s.tmp1.o:(.eh_frame+0x0)
// CHECK-NEXT: 0000000000200360 0000000000000014 0 {{.*}}{{/|\\}}map-file.s.tmp1.o:(.eh_frame+0x2c) // CHECK-NEXT: 0000000000200360 0000000000000014 1 {{.*}}{{/|\\}}map-file.s.tmp1.o:(.eh_frame+0x2c)
// CHECK-NEXT: 0000000000200378 0000000000000018 0 {{.*}}{{/|\\}}map-file.s.tmp2.o:(.eh_frame+0x18) // CHECK-NEXT: 0000000000200378 0000000000000018 1 {{.*}}{{/|\\}}map-file.s.tmp2.o:(.eh_frame+0x18)
// CHECK-NEXT: 0000000000201000 000000000000002d 4 .text // CHECK-NEXT: 0000000000201000 000000000000002d 4 .text
// CHECK-NEXT: 0000000000201000 0000000000000028 4 {{.*}}{{/|\\}}map-file.s.tmp1.o:(.text) // CHECK-NEXT: 0000000000201000 0000000000000028 4 {{.*}}{{/|\\}}map-file.s.tmp1.o:(.text)
// CHECK-NEXT: 0000000000201000 0000000000000000 0 _start // CHECK-NEXT: 0000000000201000 0000000000000000 1 _start
// CHECK-NEXT: 000000000020101f 0000000000000000 0 f(int) // CHECK-NEXT: 000000000020101f 0000000000000000 1 f(int)
// CHECK-NEXT: 0000000000201028 0000000000000000 0 local // CHECK-NEXT: 0000000000201028 0000000000000000 1 local
// CHECK-NEXT: 0000000000201028 0000000000000002 4 {{.*}}{{/|\\}}map-file.s.tmp2.o:(.text) // CHECK-NEXT: 0000000000201028 0000000000000002 4 {{.*}}{{/|\\}}map-file.s.tmp2.o:(.text)
// CHECK-NEXT: 0000000000201028 0000000000000000 0 foo // CHECK-NEXT: 0000000000201028 0000000000000000 1 foo
// CHECK-NEXT: 0000000000201029 0000000000000000 0 bar // CHECK-NEXT: 0000000000201029 0000000000000000 1 bar
// CHECK-NEXT: 000000000020102a 0000000000000000 1 {{.*}}{{/|\\}}map-file.s.tmp2.o:(.text.zed) // CHECK-NEXT: 000000000020102a 0000000000000000 1 {{.*}}{{/|\\}}map-file.s.tmp2.o:(.text.zed)
// CHECK-NEXT: 000000000020102a 0000000000000000 0 zed // CHECK-NEXT: 000000000020102a 0000000000000000 1 zed
// CHECK-NEXT: 000000000020102c 0000000000000000 4 {{.*}}{{/|\\}}map-file.s.tmp3.o:(.text) // CHECK-NEXT: 000000000020102c 0000000000000000 4 {{.*}}{{/|\\}}map-file.s.tmp3.o:(.text)
// CHECK-NEXT: 000000000020102c 0000000000000000 0 bah // CHECK-NEXT: 000000000020102c 0000000000000000 1 bah
// CHECK-NEXT: 000000000020102c 0000000000000001 4 {{.*}}{{/|\\}}map-file.s.tmp4.a(map-file.s.tmp4.o):(.text) // CHECK-NEXT: 000000000020102c 0000000000000001 4 {{.*}}{{/|\\}}map-file.s.tmp4.a(map-file.s.tmp4.o):(.text)
// CHECK-NEXT: 000000000020102c 0000000000000000 0 baz // CHECK-NEXT: 000000000020102c 0000000000000000 1 baz
// CHECK-NEXT: 0000000000201030 0000000000000030 16 .plt // CHECK-NEXT: 0000000000201030 0000000000000030 16 .plt
// CHECK-NEXT: 0000000000201030 0000000000000030 16 <internal>:(.plt) // CHECK-NEXT: 0000000000201030 0000000000000030 16 <internal>:(.plt)
// CHECK-NEXT: 0000000000201040 0000000000000000 0 sharedFunc1 // CHECK-NEXT: 0000000000201040 0000000000000000 1 sharedFunc1
// CHECK-NEXT: 0000000000201050 0000000000000000 0 sharedFunc2 // CHECK-NEXT: 0000000000201050 0000000000000000 1 sharedFunc2
// CHECK-NEXT: 0000000000202000 0000000000000028 8 .got.plt // CHECK-NEXT: 0000000000202000 0000000000000028 8 .got.plt
// CHECK-NEXT: 0000000000202000 0000000000000028 8 <internal>:(.got.plt) // CHECK-NEXT: 0000000000202000 0000000000000028 8 <internal>:(.got.plt)
// CHECK-NEXT: 0000000000203000 0000000000000100 8 .dynamic // CHECK-NEXT: 0000000000203000 0000000000000100 8 .dynamic
// CHECK-NEXT: 0000000000203000 0000000000000100 8 <internal>:(.dynamic) // CHECK-NEXT: 0000000000203000 0000000000000100 8 <internal>:(.dynamic)
// CHECK-NEXT: 0000000000204000 0000000000000010 16 .bss // CHECK-NEXT: 0000000000204000 0000000000000010 16 .bss
// CHECK-NEXT: 0000000000204000 0000000000000004 16 {{.*}}{{/|\\}}map-file.s.tmp1.o:(COMMON) // CHECK-NEXT: 0000000000204000 0000000000000004 16 {{.*}}{{/|\\}}map-file.s.tmp1.o:(COMMON)
// CHECK-NEXT: 0000000000204000 0000000000000004 0 common // CHECK-NEXT: 0000000000204000 0000000000000004 1 common
// CHECK-NEXT: 0000000000204004 0000000000000004 1 <internal>:(.bss) // CHECK-NEXT: 0000000000204004 0000000000000004 1 <internal>:(.bss)
// CHECK-NEXT: 0000000000204004 0000000000000004 0 sharedFoo // CHECK-NEXT: 0000000000204004 0000000000000004 1 sharedFoo
// CHECK-NEXT: 0000000000204008 0000000000000008 1 <internal>:(.bss) // CHECK-NEXT: 0000000000204008 0000000000000008 1 <internal>:(.bss)
// CHECK-NEXT: 0000000000204008 0000000000000008 0 sharedBar // CHECK-NEXT: 0000000000204008 0000000000000008 1 sharedBar
// CHECK-NEXT: 0000000000000000 0000000000000008 1 .comment // CHECK-NEXT: 0000000000000000 0000000000000008 1 .comment
// CHECK-NEXT: 0000000000000000 0000000000000008 1 <internal>:(.comment) // CHECK-NEXT: 0000000000000000 0000000000000008 1 <internal>:(.comment)
// CHECK-NEXT: 0000000000000000 0000000000000198 8 .symtab // CHECK-NEXT: 0000000000000000 0000000000000198 8 .symtab
// CHECK-NEXT: 0000000000000000 0000000000000198 8 <internal>:(.symtab) // CHECK-NEXT: 0000000000000000 0000000000000198 8 <internal>:(.symtab)
// CHECK-NEXT: 0000000000000000 0000000000000084 1 .shstrtab // CHECK-NEXT: 0000000000000000 0000000000000084 1 .shstrtab
// CHECK-NEXT: 0000000000000000 0000000000000084 1 <internal>:(.shstrtab) // CHECK-NEXT: 0000000000000000 0000000000000084 1 <internal>:(.shstrtab)
// CHECK-NEXT: 0000000000000000 000000000000006d 1 .strtab // CHECK-NEXT: 0000000000000000 000000000000006d 1 .strtab
// CHECK-NEXT: 0000000000000000 000000000000006d 1 <internal>:(.strtab) // CHECK-NEXT: 0000000000000000 000000000000006d 1 <internal>:(.strtab)
// RUN: not ld.lld %t1.o %t2.o %t3.o %t4.a -o %t -Map=/ 2>&1 \ // RUN: not ld.lld %t1.o %t2.o %t3.o %t4.a -o %t -Map=/ 2>&1 \
// RUN: | FileCheck -check-prefix=FAIL %s // RUN: | FileCheck -check-prefix=FAIL %s
// FAIL: cannot open map file / // FAIL: cannot open map file /