diff options
| author | Guillaume Chatelet <gchatelet@google.com> | 2022-11-24 13:19:00 +0000 |
|---|---|---|
| committer | Guillaume Chatelet <gchatelet@google.com> | 2022-11-24 13:19:18 +0000 |
| commit | e647b4f5198ace66badc5721f2bd49f00100359d (patch) | |
| tree | 4f806d2d4150be45c8458317ef634c42bffaa197 /llvm/lib/MC/MachObjectWriter.cpp | |
| parent | c418dccdbd7671c48ceec55a9ebb04c251b7fbe2 (diff) | |
| download | llvm-e647b4f5198ace66badc5721f2bd49f00100359d.zip llvm-e647b4f5198ace66badc5721f2bd49f00100359d.tar.gz llvm-e647b4f5198ace66badc5721f2bd49f00100359d.tar.bz2 | |
[reland][Alignment][NFC] Use the Align type in MCSection
Differential Revision: https://reviews.llvm.org/D138653
Diffstat (limited to 'llvm/lib/MC/MachObjectWriter.cpp')
| -rw-r--r-- | llvm/lib/MC/MachObjectWriter.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/llvm/lib/MC/MachObjectWriter.cpp b/llvm/lib/MC/MachObjectWriter.cpp index dafae3a..446d137 100644 --- a/llvm/lib/MC/MachObjectWriter.cpp +++ b/llvm/lib/MC/MachObjectWriter.cpp @@ -129,7 +129,7 @@ uint64_t MachObjectWriter::getPaddingSize(const MCSection *Sec, const MCSection &NextSec = *Layout.getSectionOrder()[Next]; if (NextSec.isVirtualSection()) return 0; - return offsetToAlignment(EndAddr, Align(NextSec.getAlignment())); + return offsetToAlignment(EndAddr, NextSec.getAlign()); } void MachObjectWriter::writeHeader(MachO::HeaderFileType Type, @@ -244,8 +244,7 @@ void MachObjectWriter::writeSection(const MCAsmLayout &Layout, } W.write<uint32_t>(FileOffset); - assert(isPowerOf2_32(Section.getAlignment()) && "Invalid alignment!"); - W.write<uint32_t>(Log2_32(Section.getAlignment())); + W.write<uint32_t>(Log2(Section.getAlign())); W.write<uint32_t>(NumRelocations ? RelocationsStart : 0); W.write<uint32_t>(NumRelocations); W.write<uint32_t>(Flags); @@ -645,7 +644,7 @@ void MachObjectWriter::computeSectionAddresses(const MCAssembler &Asm, const MCAsmLayout &Layout) { uint64_t StartAddress = 0; for (const MCSection *Sec : Layout.getSectionOrder()) { - StartAddress = alignTo(StartAddress, Sec->getAlignment()); + StartAddress = alignTo(StartAddress, Sec->getAlign()); SectionAddress[Sec] = StartAddress; StartAddress += Layout.getSectionAddressSize(Sec); |