[llvm-objdump] Use BBEntry::BBID to represent basic block numbers.

[mtrofin]

llvm/test/tools/llvm-objdump/X86/elf-bbaddrmap-disassemble-symbolize-operands.yaml

172–173

Nit: maybe use a BB ID-ing that's more "random", like 3-1-2-4 maybe, so something that could be less likely attributable to a reverse engineering of the ID.

[aidengrossman]

LGTM

[JestrTulip]

LGTM

llvm/test/tools/llvm-objdump/X86/elf-bbaddrmap-disassemble-symbolize-operands.yaml

 # RUN: yaml2obj --docnum=2 %s -o %t3
 # RUN: llvm-objdump %t3 -d --symbolize-operands -M intel --no-show-raw-insn --no-leading-addr | \
 # RUN:   FileCheck %s -DSYM=symbol --match-full-lines --check-prefixes=INTEL
 # RUN: llvm-objdump %t3 -d --symbolize-operands -M att --no-show-raw-insn --no-leading-addr | \
 # RUN:   FileCheck %s -DSYM=symbol --match-full-lines --check-prefixes=ATT
 
 ## Expect to find the branch and basic block labels and global variable name.
 # ATT:      <foo>:
-# ATT-NEXT: <BB0>:
+# ATT-NEXT: <BB3>:
 # ATT-NEXT:   pushq %rax
 # ATT-NEXT: <BB1>:
 # ATT-NEXT:   cmpl  , %eax <[[SYM]]>
 # ATT-NEXT:   nop
 # ATT-NEXT: <BB2>:
-# ATT-NEXT:   jge    <BB3>
+# ATT-NEXT:   jge    <BB5>
 # ATT-NEXT:   jmp    <BB1>
-# ATT-NEXT: <BB3>:
+# ATT-NEXT: <BB5>:
 # ATT-NEXT:   retq
 # ATT:      <bar>:
 # ATT-NEXT: <BB0>:
 # ATT-NEXT:   pushq  %rax
 # ATT-NEXT:   movl   %edx, %eax
 # ATT-NEXT:   je     <BB2>
 # ATT-NEXT: <BB1>:
 # ATT-NEXT:   xorl   %esi, %esi
 # ATT-NEXT: <BB2>:
 # ATT-NEXT:   callq  <bar>
 # ATT-NEXT:   retq
 
 # INTEL:      <foo>:
-# INTEL-NEXT: <BB0>:
+# INTEL-NEXT: <BB3>:
 # INTEL-NEXT:   push rax
 # INTEL-NEXT: <BB1>:
 # INTEL-NEXT:   cmp  eax, dword ptr <[[SYM]]>
 # INTEL-NEXT:   nop
 # INTEL-NEXT: <BB2>:
-# INTEL-NEXT:   jge   <BB3>
+# INTEL-NEXT:   jge   <BB5>
 # INTEL-NEXT:   jmp   <BB1>
-# INTEL-NEXT: <BB3>:
+# INTEL-NEXT: <BB5>:
 # INTEL-NEXT:   ret
 # INTEL:      <bar>:
 # INTEL-NEXT: <BB0>:
 # INTEL-NEXT:   push  rax
 # INTEL-NEXT:   mov   eax, edx
 # INTEL-NEXT:   je    <BB2>
 # INTEL-NEXT: <BB1>:
 # INTEL-NEXT:   xor   esi, esi
Sections:
   - Name:    .data
     Type:    SHT_PROGBITS
     Flags:   [SHF_ALLOC, SHF_WRITE]
     Address: 0x6000
   - Name:   .llvm_bb_addr_map.foo
     Type:   SHT_LLVM_BB_ADDR_MAP
     Link:   .text.foo
     Entries:
-      - Version: 1
+      - Version: 2
         Address: [[FOO_ADDR]]
         BBEntries:
-          - AddressOffset: 0x0
+          - ID:            3
+            AddressOffset: 0x0
             Size:          0x1
             Metadata:      0x1
-          - AddressOffset: 0x0
+          - ID:            1
+            AddressOffset: 0x0
             Size:          0x6
             Metadata:      0x0
-          - AddressOffset: 0x1
+          - ID:            2
+            AddressOffset: 0x1
             Size:          0x4
             Metadata:      0x0
-          - AddressOffset: 0x0
+          - ID:            5
+            AddressOffset: 0x0
             Size:          0x1
             Metadata:      0x2
   - Name:   .llvm_bb_addr_map.bar
     Type:   SHT_LLVM_BB_ADDR_MAP
     Link:   .text.bar
     Entries:
       - Version: 1
         Address: [[BAR_ADDR]]
Sections:
   - Name:    .data
     Type:    SHT_PROGBITS
     Flags:   [SHF_ALLOC, SHF_WRITE]
     Address: 0x6000
   - Name:   .llvm_bb_addr_map.foo
     Type:   SHT_LLVM_BB_ADDR_MAP
     Link:   .text.foo
     Entries:
-      - Version: 1
+      - Version: 2
         Address: 0x4000
         BBEntries:
-          - AddressOffset: 0x0
+          - ID:            3
+            AddressOffset: 0x0
             Size:          0x1
             Metadata:      0x1
-          - AddressOffset: 0x0
+          - ID:            1
+            AddressOffset: 0x0
             Size:          0x6
             Metadata:      0x0
-          - AddressOffset: 0x1
+          - ID:            2
+            AddressOffset: 0x1
             Size:          0x4
             Metadata:      0x0
-          - AddressOffset: 0x0
+          - ID:            5
+            AddressOffset: 0x0
             Size:          0x1
             Metadata:      0x2
       - Version: 1
         Address: 0x5000
         BBEntries:
           - AddressOffset: 0x0
             Size:          0x1
             Metadata:      0x1

llvm/tools/llvm-objdump/llvm-objdump.cpp

collectBBAddrMapLabels(const std::unordered_map<uint64_t, BBAddrMap> &AddrToBBAddrMap,
   if (AddrToBBAddrMap.empty())
     return;
   Labels.clear();
   uint64_t StartAddress = SectionAddr + Start;
   uint64_t EndAddress = SectionAddr + End;
   auto Iter = AddrToBBAddrMap.find(StartAddress);
   if (Iter == AddrToBBAddrMap.end())
     return;
-  for (unsigned I = 0, Size = Iter->second.BBEntries.size(); I < Size; ++I) {
-    uint64_t BBAddress = Iter->second.BBEntries[I].Offset + Iter->second.Addr;
+  for (const BBAddrMap::BBEntry &BBEntry : Iter->second.BBEntries) {
+    uint64_t BBAddress = BBEntry.Offset + Iter->second.Addr;
     if (BBAddress >= EndAddress)
       continue;
-    Labels[BBAddress].push_back(("BB" + Twine(I)).str());
+    Labels[BBAddress].push_back(("BB" + Twine(BBEntry.ID)).str());
   }
 }
 
 static void collectLocalBranchTargets(
     ArrayRef<uint8_t> Bytes, const MCInstrAnalysis *MIA, MCDisassembler *DisAsm,
     MCInstPrinter *IP, const MCSubtargetInfo *STI, uint64_t SectionAddr,
     uint64_t Start, uint64_t End, std::unordered_map<uint64_t, std::string> &Labels) {
   // So far only supports PowerPC and X86.