Make alignment of PR always the same as ED

Author: redstar

llvm/include/llvm/MC/MCGOFFAttributes.h

@@ -76,7 +76,6 @@ struct PRAttr {
   GOFF::ESDExecutable Executable = GOFF::ESD_EXE_Unspecified;
   GOFF::ESDLinkageType Linkage = GOFF::ESD_LT_XPLink;
   GOFF::ESDBindingScope BindingScope = GOFF::ESD_BSC_Unspecified;
-  GOFF::ESDAlignment Alignment = GOFF::ESD_ALIGN_Byte;
   uint32_t SortKey = 0;
 };
 

llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp

@@ -2800,13 +2800,13 @@ MCSection *TargetLoweringObjectFileGOFF::getSectionForLSDA(
       GOFF::EDAttr{false, GOFF::RMODE, GOFF::ESD_NS_Parts,
                    GOFF::ESD_TS_ByteOriented, GOFF::ESD_BA_Merge,
                    GOFF::LOADBEHAVIOR, GOFF::ESD_RQ_0,
-                   GOFF::ESD_ALIGN_Doubleword},
+                   GOFF::ESD_ALIGN_Fullword},
       static_cast<MCSectionGOFF *>(TextSection)->getParent());
-  return getContext().getGOFFSection(
-      SectionKind::getData(), Name,
-      GOFF::PRAttr{true, GOFF::ESD_EXE_DATA, GOFF::LINKAGE,
-                   GOFF::ESD_BSC_Section, GOFF::ESD_ALIGN_Fullword, 0},
-      WSA);
+  return getContext().getGOFFSection(SectionKind::getData(), Name,
+                                     GOFF::PRAttr{true, GOFF::ESD_EXE_DATA,
+                                                  GOFF::LINKAGE,
+                                                  GOFF::ESD_BSC_Section, 0},
+                                     WSA);
 }
 
 MCSection *TargetLoweringObjectFileGOFF::SelectSectionForGlobal(
@@ -2837,7 +2837,7 @@ MCSection *TargetLoweringObjectFileGOFF::SelectSectionForGlobal(
     return getContext().getGOFFSection(Kind, Symbol->getName(),
                                        GOFF::PRAttr{false, GOFF::ESD_EXE_DATA,
                                                     GOFF::LINKAGE,
-                                                    PRBindingScope, Align, 0},
+                                                    PRBindingScope, 0},
                                        ED);
   }
   return TextSection;

llvm/lib/MC/GOFFObjectWriter.cpp

@@ -258,14 +258,14 @@ class GOFFSymbol {
   }
 
   GOFFSymbol(StringRef Name, uint32_t EsdID, uint32_t ParentEsdID,
-             GOFF::ESDNameSpaceId NameSpace, const GOFF::PRAttr &Attr)
+    const GOFF::EDAttr &EDAttr, const GOFF::PRAttr &Attr)
       : Name(Name.data(), Name.size()), EsdId(EsdID), ParentEsdId(ParentEsdID),
-        SymbolType(GOFF::ESD_ST_PartReference), NameSpace(NameSpace) {
+        SymbolType(GOFF::ESD_ST_PartReference), NameSpace(EDAttr.NameSpace) {
     SymbolFlags.setRenameable(Attr.IsRenamable);
     BehavAttrs.setExecutable(Attr.Executable);
-    BehavAttrs.setAlignment(Attr.Alignment);
     BehavAttrs.setLinkageType(Attr.Linkage);
     BehavAttrs.setBindingScope(Attr.BindingScope);
+    BehavAttrs.setAlignment(EDAttr.Alignment);
   }
 };
 
@@ -307,8 +307,7 @@ void GOFFWriter::defineSectionSymbols(const MCSectionGOFF &Section) {
   if (Section.isPR()) {
     MCSectionGOFF *Parent = Section.getParent();
     GOFFSymbol PR(Section.getName(), Section.getOrdinal(), Parent->getOrdinal(),
-                  Parent->getEDAttributes().NameSpace,
-                  Section.getPRAttributes());
+                  Parent->getEDAttributes(), Section.getPRAttributes());
     PR.SectionLength = Asm.getSectionAddressSize(Section);
     if (Section.requiresNonZeroLength()) {
       // We cannot have a zero-length section for data.  If we do,

llvm/lib/MC/MCObjectFileInfo.cpp

@@ -558,11 +558,11 @@ void MCObjectFileInfo::initGOFFMCObjectFileInfo(const Triple &T) {
                    GOFF::ESD_LB_Deferred, GOFF::ESD_RQ_1,
                    GOFF::ESD_ALIGN_Quadword},
       RootSDSection);
-  ADASection = Ctx->getGOFFSection(
-      SectionKind::getData(), "#S",
-      GOFF::PRAttr{false, GOFF::ESD_EXE_DATA, GOFF::ESD_LT_XPLink,
-                   GOFF::ESD_BSC_Section, GOFF::ESD_ALIGN_Quadword, 0},
-      ADAEDSection);
+  ADASection = Ctx->getGOFFSection(SectionKind::getData(), "#S",
+                                   GOFF::PRAttr{false, GOFF::ESD_EXE_DATA,
+                                                GOFF::ESD_LT_XPLink,
+                                                GOFF::ESD_BSC_Section, 0},
+                                   ADAEDSection);
 
   TextSection = Ctx->getGOFFSection(
       SectionKind::getText(), GOFF::CLASS_CODE,
@@ -579,11 +579,11 @@ void MCObjectFileInfo::initGOFFMCObjectFileInfo(const Triple &T) {
                    GOFF::ESD_LB_Initial, GOFF::ESD_RQ_0,
                    GOFF::ESD_ALIGN_Doubleword},
       RootSDSection);
-  PPA2ListSection = Ctx->getGOFFSection(
-      SectionKind::getData(), ".&ppa2",
-      GOFF::PRAttr{true, GOFF::ESD_EXE_DATA, GOFF::ESD_LT_OS,
-                   GOFF::ESD_BSC_Section, GOFF::ESD_ALIGN_Doubleword, 0},
-      PPA2ListEDSection);
+  PPA2ListSection = Ctx->getGOFFSection(SectionKind::getData(), ".&ppa2",
+                                        GOFF::PRAttr{true, GOFF::ESD_EXE_DATA,
+                                                     GOFF::ESD_LT_OS,
+                                                     GOFF::ESD_BSC_Section, 0},
+                                        PPA2ListEDSection);
 
   IDRLSection = Ctx->getGOFFSection(
       SectionKind::getData(), "B_IDRL",

llvm/lib/MC/MCSectionGOFF.cpp

@@ -123,7 +123,7 @@ void MCSectionGOFF::printSwitchToSection(const MCAsmInfo &MAI, const Triple &T,
     ED->getParent()->printSwitchToSection(MAI, T, OS, Subsection);
     if (!Emitted) {
       emitCATTR(OS, ED->getName(), ED->getEDAttributes().Rmode,
-                PRAttributes.Alignment, ED->EDAttributes.LoadBehavior,
+                ED->EDAttributes.Alignment, ED->EDAttributes.LoadBehavior,
                 PRAttributes.Executable, ED->EDAttributes.IsReadOnly,
                 PRAttributes.SortKey, Name);
       emitXATTR(OS, Name, PRAttributes.Linkage, PRAttributes.Executable,