diff options
| author | Rahman Lavaee <rahmanl@google.com> | 2022-12-13 09:52:05 -0800 |
|---|---|---|
| committer | Rahman Lavaee <rahmanl@google.com> | 2022-12-13 11:13:57 -0800 |
| commit | 96b6ee1bdc11eeea9d202a14d5975aac992f4176 (patch) | |
| tree | 70baaf0d20fa557b2b68850331bf7b6f43192049 /llvm/lib/Object/ELF.cpp | |
| parent | f54497f114b9b5acaa8ebff296594b2cd7e437dd (diff) | |
| download | llvm-96b6ee1bdc11eeea9d202a14d5975aac992f4176.zip llvm-96b6ee1bdc11eeea9d202a14d5975aac992f4176.tar.gz llvm-96b6ee1bdc11eeea9d202a14d5975aac992f4176.tar.bz2 | |
Revert "[Propeller] Use Fixed MBB ID instead of volatile MachineBasicBlock::Number."
This reverts commit 6015a045d768feab3bae9ad9c0c81e118df8b04a.
Differential Revision: https://reviews.llvm.org/D139952
Diffstat (limited to 'llvm/lib/Object/ELF.cpp')
| -rw-r--r-- | llvm/lib/Object/ELF.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/llvm/lib/Object/ELF.cpp b/llvm/lib/Object/ELF.cpp index 80d1fc2..93d3476 100644 --- a/llvm/lib/Object/ELF.cpp +++ b/llvm/lib/Object/ELF.cpp @@ -669,7 +669,7 @@ ELFFile<ELFT>::decodeBBAddrMap(const Elf_Shdr &Sec) const { Version = Data.getU8(Cur); if (!Cur) break; - if (Version > 2) + if (Version > 1) return createError("unsupported SHT_LLVM_BB_ADDR_MAP version: " + Twine(static_cast<int>(Version))); Data.getU8(Cur); // Feature byte @@ -678,9 +678,8 @@ ELFFile<ELFT>::decodeBBAddrMap(const Elf_Shdr &Sec) const { uint32_t NumBlocks = ReadULEB128AsUInt32(); std::vector<BBAddrMap::BBEntry> BBEntries; uint32_t PrevBBEndOffset = 0; - for (uint32_t BlockIndex = 0; - !ULEBSizeErr && Cur && (BlockIndex < NumBlocks); ++BlockIndex) { - uint32_t ID = Version >= 2 ? ReadULEB128AsUInt32() : BlockIndex; + for (uint32_t BlockID = 0; !ULEBSizeErr && Cur && (BlockID < NumBlocks); + ++BlockID) { uint32_t Offset = ReadULEB128AsUInt32(); uint32_t Size = ReadULEB128AsUInt32(); uint32_t Metadata = ReadULEB128AsUInt32(); @@ -689,7 +688,7 @@ ELFFile<ELFT>::decodeBBAddrMap(const Elf_Shdr &Sec) const { Offset += PrevBBEndOffset; PrevBBEndOffset = Offset + Size; } - BBEntries.push_back({ID, Offset, Size, Metadata}); + BBEntries.push_back({Offset, Size, Metadata}); } FunctionEntries.push_back({Address, std::move(BBEntries)}); } |