Reuse NameSpace from ED in PR/LD

Author: redstar

llvm/include/llvm/MC/MCGOFFAttributes.h

@@ -66,7 +66,6 @@ struct EDAttr {
 struct LDAttr {
   bool IsRenamable = false;
   GOFF::ESDExecutable Executable = GOFF::ESD_EXE_Unspecified;
-  GOFF::ESDNameSpaceId NameSpace = GOFF::ESD_NS_NormalName;
   GOFF::ESDBindingStrength BindingStrength = GOFF::ESD_BST_Strong;
   GOFF::ESDLinkageType Linkage = GOFF::ESD_LT_XPLink;
   GOFF::ESDAmode Amode;
@@ -78,7 +77,6 @@ struct PRAttr {
   bool IsRenamable = false;
   bool IsReadOnly = false; // ???? Not documented.
   GOFF::ESDExecutable Executable = GOFF::ESD_EXE_Unspecified;
-  GOFF::ESDNameSpaceId NameSpace = GOFF::ESD_NS_NormalName;
   GOFF::ESDLinkageType Linkage = GOFF::ESD_LT_XPLink;
   GOFF::ESDAmode Amode;
   GOFF::ESDBindingScope BindingScope = GOFF::ESD_BSC_Unspecified;

llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp

@@ -2778,9 +2778,9 @@ void TargetLoweringObjectFileGOFF::getModuleMetadata(Module &M) {
   // Initialize the label for the text section.
   MCSymbolGOFF *TextLD = static_cast<MCSymbolGOFF *>(
       getContext().getOrCreateSymbol(RootSD->getName()));
-  TextLD->setLDAttributes(GOFF::LDAttr{
-      false, GOFF::ESD_EXE_CODE, GOFF::ESD_NS_NormalName, GOFF::ESD_BST_Strong,
-      GOFF::LINKAGE, GOFF::AMODE, GOFF::ESD_BSC_Section});
+  TextLD->setLDAttributes(GOFF::LDAttr{false, GOFF::ESD_EXE_CODE,
+                                       GOFF::ESD_BST_Strong, GOFF::LINKAGE,
+                                       GOFF::AMODE, GOFF::ESD_BSC_Section});
   TextLD->setADA(ADAPR);
   TextSection->setBeginSymbol(TextLD);
 }
@@ -2803,9 +2803,9 @@ MCSection *TargetLoweringObjectFileGOFF::getSectionForLSDA(
       static_cast<MCSectionGOFF *>(TextSection)->getParent());
   return getContext().getGOFFSection(
       SectionKind::getData(), Name,
-      GOFF::PRAttr{true, false, GOFF::ESD_EXE_Unspecified, GOFF::ESD_NS_Parts,
-                   GOFF::LINKAGE, GOFF::AMODE, GOFF::ESD_BSC_Section,
-                   GOFF::ESD_DSS_NoWarning, GOFF::ESD_ALIGN_Fullword, 0},
+      GOFF::PRAttr{true, false, GOFF::ESD_EXE_Unspecified, GOFF::LINKAGE,
+                   GOFF::AMODE, GOFF::ESD_BSC_Section, GOFF::ESD_DSS_NoWarning,
+                   GOFF::ESD_ALIGN_Fullword, 0},
       WSA);
 }
 
@@ -2834,9 +2834,8 @@ MCSection *TargetLoweringObjectFileGOFF::SelectSectionForGlobal(
         SD);
     return getContext().getGOFFSection(
         Kind, Symbol->getName(),
-        GOFF::PRAttr{false, false, GOFF::ESD_EXE_DATA, GOFF::ESD_NS_Parts,
-                     GOFF::LINKAGE, GOFF::AMODE, PRBindingScope,
-                     GOFF::ESD_DSS_NoWarning,
+        GOFF::PRAttr{false, false, GOFF::ESD_EXE_DATA, GOFF::LINKAGE,
+                     GOFF::AMODE, PRBindingScope, GOFF::ESD_DSS_NoWarning,
                      static_cast<GOFF::ESDAlignment>(GO->getAlignment()), 0},
         ED);
   }

llvm/lib/MC/GOFFObjectWriter.cpp

@@ -246,10 +246,9 @@ class GOFFSymbol {
   }
 
   GOFFSymbol(StringRef Name, uint32_t EsdID, uint32_t ParentEsdID,
-             const GOFF::LDAttr &Attr)
+             GOFF::ESDNameSpaceId NameSpace, const GOFF::LDAttr &Attr)
       : Name(Name.data(), Name.size()), EsdId(EsdID), ParentEsdId(ParentEsdID),
-        SymbolType(GOFF::ESD_ST_LabelDefinition) {
-    this->NameSpace = Attr.NameSpace;
+        SymbolType(GOFF::ESD_ST_LabelDefinition), NameSpace(NameSpace) {
     SymbolFlags.setRenameable(Attr.IsRenamable);
     BehavAttrs.setExecutable(Attr.Executable);
     BehavAttrs.setBindingStrength(Attr.BindingStrength);
@@ -259,10 +258,9 @@ class GOFFSymbol {
   }
 
   GOFFSymbol(StringRef Name, uint32_t EsdID, uint32_t ParentEsdID,
-             const GOFF::PRAttr &Attr)
+             GOFF::ESDNameSpaceId NameSpace, const GOFF::PRAttr &Attr)
       : Name(Name.data(), Name.size()), EsdId(EsdID), ParentEsdId(ParentEsdID),
-        SymbolType(GOFF::ESD_ST_PartReference) {
-    this->NameSpace = Attr.NameSpace;
+        SymbolType(GOFF::ESD_ST_PartReference), NameSpace(NameSpace) {
     SymbolFlags.setRenameable(Attr.IsRenamable);
     BehavAttrs.setExecutable(Attr.Executable);
     BehavAttrs.setAlignment(Attr.Alignment);
@@ -310,8 +308,10 @@ void GOFFWriter::defineSectionSymbols(const MCSectionGOFF &Section) {
   }
 
   if (Section.isPR()) {
-    GOFFSymbol PR(Section.getName(), Section.getOrdinal(),
-                  Section.getParent()->getOrdinal(), Section.getPRAttributes());
+    MCSectionGOFF *Parent = Section.getParent();
+    GOFFSymbol PR(Section.getName(), Section.getOrdinal(), Parent->getOrdinal(),
+                  Parent->getEDAttributes().NameSpace,
+                  Section.getPRAttributes());
     PR.SectionLength = Asm.getSectionAddressSize(Section);
     if (Section.requiresNonZeroLength()) {
       // We cannot have a zero-length section for data.  If we do,
@@ -327,9 +327,9 @@ void GOFFWriter::defineSectionSymbols(const MCSectionGOFF &Section) {
 }
 
 void GOFFWriter::defineLabel(const MCSymbolGOFF &Symbol) {
-  GOFFSymbol LD(Symbol.getName(), Symbol.getIndex(),
-                static_cast<MCSectionGOFF &>(Symbol.getSection()).getOrdinal(),
-                Symbol.getLDAttributes());
+  MCSectionGOFF &Section = static_cast<MCSectionGOFF &>(Symbol.getSection());
+  GOFFSymbol LD(Symbol.getName(), Symbol.getIndex(), Section.getOrdinal(),
+                Section.getEDAttributes().NameSpace, Symbol.getLDAttributes());
   if (Symbol.getADA())
     LD.ADAEsdId = Symbol.getADA()->getOrdinal();
   writeSymbol(LD);

llvm/lib/MC/MCObjectFileInfo.cpp

@@ -560,9 +560,9 @@ void MCObjectFileInfo::initGOFFMCObjectFileInfo(const Triple &T) {
       RootSDSection);
   ADASection = Ctx->getGOFFSection(
       SectionKind::getData(), "#S",
-      GOFF::PRAttr{false, false, GOFF::ESD_EXE_DATA, GOFF::ESD_NS_Parts,
-                   GOFF::ESD_LT_XPLink, GOFF::AMODE, GOFF::ESD_BSC_Section,
-                   GOFF::ESD_DSS_NoWarning, GOFF::ESD_ALIGN_Quadword, 0},
+      GOFF::PRAttr{false, false, GOFF::ESD_EXE_DATA, GOFF::ESD_LT_XPLink,
+                   GOFF::AMODE, GOFF::ESD_BSC_Section, GOFF::ESD_DSS_NoWarning,
+                   GOFF::ESD_ALIGN_Quadword, 0},
       ADAEDSection);
 
   TextSection = Ctx->getGOFFSection(
@@ -582,9 +582,9 @@ void MCObjectFileInfo::initGOFFMCObjectFileInfo(const Triple &T) {
       RootSDSection);
   PPA2ListSection = Ctx->getGOFFSection(
       SectionKind::getData(), ".&ppa2",
-      GOFF::PRAttr{true, false, GOFF::ESD_EXE_Unspecified, GOFF::ESD_NS_Parts,
-                   GOFF::ESD_LT_OS, GOFF::AMODE, GOFF::ESD_BSC_Section,
-                   GOFF::ESD_DSS_NoWarning, GOFF::ESD_ALIGN_Doubleword, 0},
+      GOFF::PRAttr{true, false, GOFF::ESD_EXE_Unspecified, GOFF::ESD_LT_OS,
+                   GOFF::AMODE, GOFF::ESD_BSC_Section, GOFF::ESD_DSS_NoWarning,
+                   GOFF::ESD_ALIGN_Doubleword, 0},
       PPA2ListEDSection);
 
   IDRLSection = Ctx->getGOFFSection(