Address review comments.

Author: Prabhuk

llvm/test/tools/llvm-readobj/ELF/call-graph-info-err-missing-indirect.test

@@ -1,4 +1,4 @@
-## Tests that --call-graph-info fails if .callgraph section does not have
+## Tests that --call-graph-info fails if .llvm.callgraph section does not have
 ## an expected value, e.g., not as much call sites as the given count.
 
 # REQUIRES: x86-registered-target

llvm/test/tools/llvm-readobj/ELF/call-graph-info-err-no-callgraph-section.test

@@ -3,11 +3,11 @@
 # REQUIRES: x86-registered-target
 
 # RUN: llvm-mc %s -filetype=obj -triple=x86_64-pc-linux -o %t
-# RUN: not llvm-readelf --call-graph-info %t 2>&1 | FileCheck %s --match-full-lines -DFILE=%t
-# RUN: not llvm-readelf --elf-output-style=LLVM --call-graph-info %t 2>&1 | FileCheck %s --match-full-lines -DFILE=%t
-# RUN: not llvm-readelf --elf-output-style=JSON --pretty-print --call-graph-info %t 2>&1 | FileCheck %s --match-full-lines -DFILE=%t
+# RUN: not llvm-readelf --call-graph-info %t 2>&1 | FileCheck %s -DFILE=%t
+# RUN: not llvm-readelf --elf-output-style=LLVM --call-graph-info %t 2>&1 | FileCheck %s -DFILE=%t
+# RUN: not llvm-readelf --elf-output-style=JSON --pretty-print --call-graph-info %t 2>&1 | FileCheck %s -DFILE=%t
 
-# CHECK: {{.*}}llvm-readelf{{.*}}: error: 'Missing section': No .llvm.callgraph section found.
+# CHECK: error: 'Missing section': No .llvm.callgraph section found.
 
 .text
 .globl _Z3foov

llvm/test/tools/llvm-readobj/ELF/call-graph-info.test

@@ -44,34 +44,34 @@
 # CHECK: Call graph section '.llvm.callgraph' contains 4 entries:
 # CHECK-EMPTY:
 # CHECK-NEXT: Entry 0:
-# CHECK-NEXT:    Address:           0x1790 <foo>
+# CHECK-NEXT:    Address:          0x1790 <foo>
 # CHECK-NEXT:    Indirect Target:  Yes
 # CHECK-NEXT:    Type ID:          0x3ecbeef531f74424
 # CHECK-NEXT:    Direct Callees (0):
 # CHECK-NEXT:    Indirect Callees by Type ID (0):
 # CHECK-EMPTY:
 # CHECK-NEXT: Entry 1:
-# CHECK-NEXT:    Address:           0x17a0 <bar>
+# CHECK-NEXT:    Address:          0x17a0 <bar>
 # CHECK-NEXT:    Indirect Target:  Yes
 # CHECK-NEXT:    Type ID:          0x3ecbeef531f74424
 # CHECK-NEXT:    Direct Callees (0):
 # CHECK-NEXT:    Indirect Callees by Type ID (0):
 # CHECK-EMPTY:
 # CHECK-NEXT: Entry 2:
-# CHECK-NEXT:    Address:           0x17b0 <baz>
+# CHECK-NEXT:    Address:          0x17b0 <baz>
 # CHECK-NEXT:    Indirect Target:  Yes
 # CHECK-NEXT:    Type ID:          0x308e4b8159bc8654
 # CHECK-NEXT:    Direct Callees (0):
 # CHECK-NEXT:    Indirect Callees by Type ID (0):
 # CHECK-EMPTY:
 # CHECK-NEXT: Entry 3:
-# CHECK-NEXT:    Address:           0x17c0 <main>
+# CHECK-NEXT:    Address:          0x17c0 <main>
 # CHECK-NEXT:    Indirect Target:  Yes
 # CHECK-NEXT:    Type ID:          0xfa6809609a76afca
 # CHECK-NEXT:    Direct Callees (3):
-# CHECK-NEXT:       Address:           0x1790 <foo>
-# CHECK-NEXT:       Address:           0x17a0 <bar>
-# CHECK-NEXT:       Address:           0x17b0 <baz>
+# CHECK-NEXT:       Address:          0x1790 <foo>
+# CHECK-NEXT:       Address:          0x17a0 <bar>
+# CHECK-NEXT:       Address:          0x17b0 <baz>
 # CHECK-NEXT:    Indirect Callees by Type ID (2):
 # CHECK-NEXT:      0x3ecbeef531f74424
 # CHECK-NEXT:      0x308e4b8159bc8654
@@ -584,7 +584,7 @@ Sections:
     EntSize:         0x1
     Content:         004675636873696120636C616E672076657273696F6E2032322E302E306769742028676974406769746875622E636F6D3A5072616268756B2F6C6C766D2D70726F6A6563742E676974203934396232653930373439623765376438353739663838626231303366373535353832393465666229004C696E6B65723A2046756368736961204C4C442032322E302E302028676974406769746875622E636F6D3A5072616268756B2F6C6C766D2D70726F6A6563742E676974203934396232653930373439623765376438353739663838626231303366373535353832393465666229004675636873696120636C616E672076657273696F6E2032322E302E306769742028676974406769746875622E636F6D3A5072616268756B2F6C6C766D2D70726F6A6563742E676974203861333966396231386139343632386138656463666433613137363432376364333161656330633829004675636873696120636C616E672076657273696F6E2032322E302E306769742028676974406769746875622E636F6D3A5072616268756B2F6C6C766D2D70726F6A6563742E67697420653038356135633833363436316632396437336637333933343334343765643964353338626563312900
   - Name:            .llvm.callgraph
-    Type:            0x6FFF4C0F
+    Type:            SHT_LLVM_CALL_GRAPH
     Flags:           [ SHF_LINK_ORDER ]
     Link:            .text
     AddressAlign:    0x1

llvm/tools/llvm-readobj/ELFDumper.cpp

@@ -5497,7 +5497,8 @@ template <class ELFT> void GNUELFDumper<ELFT>::printCallGraphInfo() {
   auto PrintFunc = [](uint64_t FuncEntryPC, std::string FuncSymName,
                       formatted_raw_ostream &OS) {
     OS.PadToColumn(4);
-    OS << "Address:           ";
+    OS << "Address:";
+    OS.PadToColumn(21);
     OS << to_string(format_hex(FuncEntryPC, 1));
     if (!FuncSymName.empty())
       OS << " <" << FuncSymName << ">";