Revert D139098 "[Alignment] Use Align for ObjectFile::getSectionAlignment"

This breaks lld.

This reverts commit 10c47465e2505ddfee4e62a2ab2e535abea3ec56.

diff --git a/llvm/include/llvm/Object/COFF.h b/llvm/include/llvm/Object/COFF.h
index 20faa54..8ad065d 100644 (file)
--- a/llvm/include/llvm/Object/COFF.h
+++ b/llvm/include/llvm/Object/COFF.h
@@ -456,16 +456,18 @@ struct coff_section {
            NumberOfRelocations == UINT16_MAX;
   }
 
-  Align getAlignment() const {
+  uint32_t getAlignment() const {
     // The IMAGE_SCN_TYPE_NO_PAD bit is a legacy way of getting to
     // IMAGE_SCN_ALIGN_1BYTES.
     if (Characteristics & COFF::IMAGE_SCN_TYPE_NO_PAD)
-      return Align(1);
+      return 1;
 
     // Bit [20:24] contains section alignment. 0 means use a default alignment
     // of 16.
-    uint32_t EncodedLogValue = (Characteristics >> 20) & 0xF;
-    return decodeMaybeAlign(EncodedLogValue).value_or(Align(16));
+    uint32_t Shift = (Characteristics >> 20) & 0xF;
+    if (Shift > 0)
+      return 1U << (Shift - 1);
+    return 16;
   }
 };
 
@@ -944,7 +946,7 @@ protected:
   uint64_t getSectionSize(DataRefImpl Sec) const override;
   Expected<ArrayRef<uint8_t>>
   getSectionContents(DataRefImpl Sec) const override;
-  Align getSectionAlignment(DataRefImpl Sec) const override;
+  uint64_t getSectionAlignment(DataRefImpl Sec) const override;
   bool isSectionCompressed(DataRefImpl Sec) const override;
   bool isSectionText(DataRefImpl Sec) const override;
   bool isSectionData(DataRefImpl Sec) const override;

diff --git a/llvm/include/llvm/Object/ELFObjectFile.h b/llvm/include/llvm/Object/ELFObjectFile.h
index 5e90dc5..cbbec13 100644 (file)
--- a/llvm/include/llvm/Object/ELFObjectFile.h
+++ b/llvm/include/llvm/Object/ELFObjectFile.h
@@ -294,7 +294,7 @@ protected:
   uint64_t getSectionSize(DataRefImpl Sec) const override;
   Expected<ArrayRef<uint8_t>>
   getSectionContents(DataRefImpl Sec) const override;
-  Align getSectionAlignment(DataRefImpl Sec) const override;
+  uint64_t getSectionAlignment(DataRefImpl Sec) const override;
   bool isSectionCompressed(DataRefImpl Sec) const override;
   bool isSectionText(DataRefImpl Sec) const override;
   bool isSectionData(DataRefImpl Sec) const override;
@@ -870,10 +870,8 @@ ELFObjectFile<ELFT>::getSectionContents(DataRefImpl Sec) const {
 }
 
 template <class ELFT>
-Align ELFObjectFile<ELFT>::getSectionAlignment(DataRefImpl Sec) const {
-  // The value 0 or 1 means that the section has no alignment constraints.
-  // https://man7.org/linux/man-pages/man5/elf.5.html
-  return MaybeAlign(getSection(Sec)->sh_addralign).valueOrOne();
+uint64_t ELFObjectFile<ELFT>::getSectionAlignment(DataRefImpl Sec) const {
+  return getSection(Sec)->sh_addralign;
 }
 
 template <class ELFT>

diff --git a/llvm/include/llvm/Object/MachO.h b/llvm/include/llvm/Object/MachO.h
index 14dd8c2..00e2fc6 100644 (file)
--- a/llvm/include/llvm/Object/MachO.h
+++ b/llvm/include/llvm/Object/MachO.h
@@ -446,7 +446,7 @@ public:
   ArrayRef<uint8_t> getSectionContents(uint32_t Offset, uint64_t Size) const;
   Expected<ArrayRef<uint8_t>>
   getSectionContents(DataRefImpl Sec) const override;
-  Align getSectionAlignment(DataRefImpl Sec) const override;
+  uint64_t getSectionAlignment(DataRefImpl Sec) const override;
   Expected<SectionRef> getSection(unsigned SectionIndex) const;
   Expected<SectionRef> getSection(StringRef SectionName) const;
   bool isSectionCompressed(DataRefImpl Sec) const override;

diff --git a/llvm/include/llvm/Object/ObjectFile.h b/llvm/include/llvm/Object/ObjectFile.h
index 3921776..c936ff8 100644 (file)
--- a/llvm/include/llvm/Object/ObjectFile.h
+++ b/llvm/include/llvm/Object/ObjectFile.h
@@ -266,7 +266,7 @@ protected:
   virtual uint64_t getSectionSize(DataRefImpl Sec) const = 0;
   virtual Expected<ArrayRef<uint8_t>>
   getSectionContents(DataRefImpl Sec) const = 0;
-  virtual Align getSectionAlignment(DataRefImpl Sec) const = 0;
+  virtual uint64_t getSectionAlignment(DataRefImpl Sec) const = 0;
   virtual bool isSectionCompressed(DataRefImpl Sec) const = 0;
   virtual bool isSectionText(DataRefImpl Sec) const = 0;
   virtual bool isSectionData(DataRefImpl Sec) const = 0;
@@ -482,7 +482,7 @@ inline Expected<StringRef> SectionRef::getContents() const {
 }
 
 inline uint64_t SectionRef::getAlignment() const {
-  return OwningObject->getSectionAlignment(SectionPimpl).value();
+  return OwningObject->getSectionAlignment(SectionPimpl);
 }
 
 inline bool SectionRef::isCompressed() const {

diff --git a/llvm/include/llvm/Object/Wasm.h b/llvm/include/llvm/Object/Wasm.h
index faf94ed..a26f703 100644 (file)
--- a/llvm/include/llvm/Object/Wasm.h
+++ b/llvm/include/llvm/Object/Wasm.h
@@ -181,7 +181,7 @@ public:
   uint64_t getSectionSize(DataRefImpl Sec) const override;
   Expected<ArrayRef<uint8_t>>
   getSectionContents(DataRefImpl Sec) const override;
-  Align getSectionAlignment(DataRefImpl Sec) const override;
+  uint64_t getSectionAlignment(DataRefImpl Sec) const override;
   bool isSectionCompressed(DataRefImpl Sec) const override;
   bool isSectionText(DataRefImpl Sec) const override;
   bool isSectionData(DataRefImpl Sec) const override;

diff --git a/llvm/include/llvm/Object/XCOFFObjectFile.h b/llvm/include/llvm/Object/XCOFFObjectFile.h
index 4efda9e..9ef94f4 100644 (file)
--- a/llvm/include/llvm/Object/XCOFFObjectFile.h
+++ b/llvm/include/llvm/Object/XCOFFObjectFile.h
@@ -581,7 +581,7 @@ public:
   uint64_t getSectionSize(DataRefImpl Sec) const override;
   Expected<ArrayRef<uint8_t>>
   getSectionContents(DataRefImpl Sec) const override;
-  Align getSectionAlignment(DataRefImpl Sec) const override;
+  uint64_t getSectionAlignment(DataRefImpl Sec) const override;
   bool isSectionCompressed(DataRefImpl Sec) const override;
   bool isSectionText(DataRefImpl Sec) const override;
   bool isSectionData(DataRefImpl Sec) const override;

diff --git a/llvm/lib/ExecutionEngine/JITLink/COFFLinkGraphBuilder.cpp b/llvm/lib/ExecutionEngine/JITLink/COFFLinkGraphBuilder.cpp
index 23ab82e..782928c 100644 (file)
--- a/llvm/lib/ExecutionEngine/JITLink/COFFLinkGraphBuilder.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/COFFLinkGraphBuilder.cpp
@@ -162,7 +162,7 @@ Error COFFLinkGraphBuilder::graphifySections() {
       B = &G->createZeroFillBlock(
           *GraphSec, getSectionSize(Obj, *Sec),
           orc::ExecutorAddr(getSectionAddress(Obj, *Sec)),
-          (*Sec)->getAlignment().value(), 0);
+          (*Sec)->getAlignment(), 0);
     else {
       ArrayRef<uint8_t> Data;
       if (auto Err = Obj.getSectionContents(*Sec, Data))
@@ -178,7 +178,7 @@ Error COFFLinkGraphBuilder::graphifySections() {
 
       B = &G->createContentBlock(
           *GraphSec, CharData, orc::ExecutorAddr(getSectionAddress(Obj, *Sec)),
-          (*Sec)->getAlignment().value(), 0);
+          (*Sec)->getAlignment(), 0);
     }
 
     setGraphBlock(SecIndex, B);

diff --git a/llvm/lib/Object/COFFObjectFile.cpp b/llvm/lib/Object/COFFObjectFile.cpp
index a74ff39..d0ca50e 100644 (file)
--- a/llvm/lib/Object/COFFObjectFile.cpp
+++ b/llvm/lib/Object/COFFObjectFile.cpp
@@ -299,9 +299,9 @@ COFFObjectFile::getSectionContents(DataRefImpl Ref) const {
   return Res;
 }
 
-Align COFFObjectFile::getSectionAlignment(DataRefImpl Ref) const {
+uint64_t COFFObjectFile::getSectionAlignment(DataRefImpl Ref) const {
   const coff_section *Sec = toSec(Ref);
-  return Align(Sec->getAlignment());
+  return Sec->getAlignment();
 }
 
 bool COFFObjectFile::isSectionCompressed(DataRefImpl Sec) const {

diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp
index 7f90284..39e84ff 100644 (file)
--- a/llvm/lib/Object/MachOObjectFile.cpp
+++ b/llvm/lib/Object/MachOObjectFile.cpp
@@ -1990,10 +1990,17 @@ MachOObjectFile::getSectionContents(DataRefImpl Sec) const {
   return getSectionContents(Offset, Size);
 }
 
-Align MachOObjectFile::getSectionAlignment(DataRefImpl Sec) const {
+uint64_t MachOObjectFile::getSectionAlignment(DataRefImpl Sec) const {
+  uint32_t Align;
+  if (is64Bit()) {
+    MachO::section_64 Sect = getSection64(Sec);
+    Align = Sect.align;
+  } else {
+    MachO::section Sect = getSection(Sec);
+    Align = Sect.align;
+  }
 
-  return is64Bit() ? Align(1ULL << getSection64(Sec).align)
-                   : Align(1ULL << getSection(Sec).align);
+  return uint64_t(1) << Align;
 }
 
 Expected<SectionRef> MachOObjectFile::getSection(unsigned SectionIndex) const {

diff --git a/llvm/lib/Object/WasmObjectFile.cpp b/llvm/lib/Object/WasmObjectFile.cpp
index 6657102..0e24ac9 100644 (file)
--- a/llvm/lib/Object/WasmObjectFile.cpp
+++ b/llvm/lib/Object/WasmObjectFile.cpp
@@ -1735,8 +1735,8 @@ WasmObjectFile::getSectionContents(DataRefImpl Sec) const {
   return S.Content;
 }
 
-Align WasmObjectFile::getSectionAlignment(DataRefImpl Sec) const {
-  return Align(1);
+uint64_t WasmObjectFile::getSectionAlignment(DataRefImpl Sec) const {
+  return 1;
 }
 
 bool WasmObjectFile::isSectionCompressed(DataRefImpl Sec) const {

diff --git a/llvm/lib/Object/XCOFFObjectFile.cpp b/llvm/lib/Object/XCOFFObjectFile.cpp
index c6a571b..061c47d 100644 (file)
--- a/llvm/lib/Object/XCOFFObjectFile.cpp
+++ b/llvm/lib/Object/XCOFFObjectFile.cpp
@@ -417,9 +417,10 @@ XCOFFObjectFile::getSectionContents(DataRefImpl Sec) const {
   return makeArrayRef(ContentStart,SectionSize);
 }
 
-Align XCOFFObjectFile::getSectionAlignment(DataRefImpl Sec) const {
+uint64_t XCOFFObjectFile::getSectionAlignment(DataRefImpl Sec) const {
+  uint64_t Result = 0;
   llvm_unreachable("Not yet implemented!");
-  return {};
+  return Result;
 }
 
 uint64_t XCOFFObjectFile::getSectionFileOffsetToRawData(DataRefImpl Sec) const {