Rebase and fix compile errors due to refactoring.

Author: redstar

llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp

@@ -2838,9 +2838,14 @@ MCSection *TargetLoweringObjectFileGOFF::SelectSectionForGlobal(
     GOFF::ESDBindingScope SDBindingScope =
         PRBindingScope == GOFF::ESD_BSC_Section ? GOFF::ESD_BSC_Section
                                                 : GOFF::ESD_BSC_Unspecified;
+    MaybeAlign Alignment;
+    if (auto *F = dyn_cast<Function>(GO))
+      Alignment = F->getAlign();
+    else if (auto *V = dyn_cast<GlobalVariable>(GO))
+      Alignment = V->getAlign();
     GOFF::ESDAlignment Align =
-        GO->getAlign() ? static_cast<GOFF::ESDAlignment>(Log2(*GO->getAlign()))
-                       : GOFF::ESD_ALIGN_Doubleword;
+        Alignment ? static_cast<GOFF::ESDAlignment>(Log2(*Alignment))
+                  : GOFF::ESD_ALIGN_Doubleword;
     MCSectionGOFF *SD = getContext().getGOFFSection(
         SectionKind::getMetadata(), Symbol->getName(),
         GOFF::SDAttr{GOFF::ESD_TA_Unspecified, SDBindingScope});

llvm/lib/MC/GOFFObjectWriter.cpp

@@ -271,7 +271,7 @@ class GOFFSymbol {
 
 class GOFFWriter {
   GOFFOstream OS;
-  [[maybe_unused]] MCAssembler &Asm;
+  MCAssembler &Asm;
 
   void writeHeader();
   void writeSymbol(const GOFFSymbol &Symbol);
@@ -282,12 +282,13 @@ class GOFFWriter {
   void defineSymbols();
 
 public:
-  GOFFWriter(raw_pwrite_stream &OS);
+  GOFFWriter(raw_pwrite_stream &OS, MCAssembler &Asm);
   uint64_t writeObject();
 };
 } // namespace
 
-GOFFWriter::GOFFWriter(raw_pwrite_stream &OS) : OS(OS) {}
+GOFFWriter::GOFFWriter(raw_pwrite_stream &OS, MCAssembler &Asm)
+    : OS(OS), Asm(Asm) {}
 
 void GOFFWriter::defineSectionSymbols(const MCSectionGOFF &Section) {
   if (Section.isSD()) {
@@ -445,7 +446,7 @@ GOFFObjectWriter::GOFFObjectWriter(
 GOFFObjectWriter::~GOFFObjectWriter() {}
 
 uint64_t GOFFObjectWriter::writeObject() {
-  uint64_t Size = GOFFWriter(OS).writeObject();
+  uint64_t Size = GOFFWriter(OS, *Asm).writeObject();
   return Size;
 }