Fix key for hashmap and introduce union

Author: redstar

llvm/include/llvm/MC/MCContext.h

@@ -270,21 +270,6 @@ class MCContext {
     }
   };
 
-  struct GOFFSectionKey {
-    std::string SectionName;
-    GOFF::ESDSymbolType SymbolType;
-
-    GOFFSectionKey(StringRef SectionName, GOFF::ESDSymbolType SymbolType)
-        : SectionName(SectionName), SymbolType(SymbolType) {}
-
-    bool operator<(const GOFFSectionKey &Other) const {
-      if (SymbolType == Other.SymbolType) {
-        return SectionName < Other.SectionName;
-      }
-      return SymbolType < Other.SymbolType;
-    }
-  };
-
   struct WasmSectionKey {
     std::string SectionName;
     StringRef GroupName;
@@ -338,7 +323,7 @@ class MCContext {
   StringMap<MCSectionMachO *> MachOUniquingMap;
   std::map<COFFSectionKey, MCSectionCOFF *> COFFUniquingMap;
   StringMap<MCSectionELF *> ELFUniquingMap;
-  std::map<GOFFSectionKey, MCSectionGOFF *> GOFFUniquingMap;
+  std::map<std::string, MCSectionGOFF *> GOFFUniquingMap;
   std::map<WasmSectionKey, MCSectionWasm *> WasmUniquingMap;
   std::map<XCOFFSectionKey, MCSectionXCOFF *> XCOFFUniquingMap;
   StringMap<MCSectionDXContainer *> DXCUniquingMap;
@@ -616,11 +601,9 @@ class MCContext {
                                                    unsigned EntrySize);
 
 private:
-  MCSectionGOFF *getGOFFSection(SectionKind Kind,
-                                GOFF::ESDSymbolType SymbolType, StringRef Name,
-                                GOFF::SDAttr SDAttributes,
-                                GOFF::EDAttr EDAttributes,
-                                GOFF::PRAttr PRAttributes, MCSection *Parent);
+  template <typename TAttr>
+  MCSectionGOFF *getGOFFSection(SectionKind Kind, StringRef Name,
+                                TAttr SDAttributes, MCSection *Parent);
 
 public:
   MCSectionGOFF *getGOFFSection(SectionKind Kind, StringRef Name,

llvm/include/llvm/MC/MCSectionGOFF.h

@@ -30,9 +30,11 @@ class MCSectionGOFF final : public MCSection {
   MCSectionGOFF *Parent;
 
   // The attributes of the GOFF symbols.
-  GOFF::SDAttr SDAttributes;
-  GOFF::EDAttr EDAttributes;
-  GOFF::PRAttr PRAttributes;
+  union {
+    GOFF::SDAttr SDAttributes;
+    GOFF::EDAttr EDAttributes;
+    GOFF::PRAttr PRAttributes;
+  };
 
   // The type of this section.
   GOFF::ESDSymbolType SymbolType;
@@ -47,13 +49,27 @@ class MCSectionGOFF final : public MCSection {
 
   friend class MCContext;
   friend class MCSymbolGOFF;
-  MCSectionGOFF(StringRef Name, SectionKind K, GOFF::ESDSymbolType SymbolType,
-                GOFF::SDAttr SDAttributes, GOFF::EDAttr EDAttributes,
-                GOFF::PRAttr PRAttributes, MCSectionGOFF *Parent = nullptr)
+
+  MCSectionGOFF(StringRef Name, SectionKind K, GOFF::SDAttr SDAttributes,
+                MCSectionGOFF *Parent)
+      : MCSection(SV_GOFF, Name, K.isText(), /*IsVirtual=*/false, nullptr),
+        Parent(Parent), SDAttributes(SDAttributes),
+        SymbolType(GOFF::ESD_ST_SectionDefinition), RequiresNonZeroLength(0),
+        Emitted(0) {}
+
+  MCSectionGOFF(StringRef Name, SectionKind K, GOFF::EDAttr EDAttributes,
+                MCSectionGOFF *Parent)
+      : MCSection(SV_GOFF, Name, K.isText(), /*IsVirtual=*/false, nullptr),
+        Parent(Parent), EDAttributes(EDAttributes),
+        SymbolType(GOFF::ESD_ST_ElementDefinition), RequiresNonZeroLength(0),
+        Emitted(0) {}
+
+  MCSectionGOFF(StringRef Name, SectionKind K, GOFF::PRAttr PRAttributes,
+                MCSectionGOFF *Parent)
       : MCSection(SV_GOFF, Name, K.isText(), /*IsVirtual=*/false, nullptr),
-        Parent(Parent), SDAttributes(SDAttributes), EDAttributes(EDAttributes),
-        PRAttributes(PRAttributes), SymbolType(SymbolType),
-        RequiresNonZeroLength(0), Emitted(0) {}
+        Parent(Parent), PRAttributes(PRAttributes),
+        SymbolType(GOFF::ESD_ST_PartReference), RequiresNonZeroLength(0),
+        Emitted(0) {}
 
 public:
   void printSwitchToSection(const MCAsmInfo &MAI, const Triple &T,

llvm/lib/MC/MCContext.cpp

@@ -672,45 +672,44 @@ MCContext::getELFUniqueIDForEntsize(StringRef SectionName, unsigned Flags,
                                       : std::nullopt;
 }
 
-MCSectionGOFF *
-MCContext::getGOFFSection(SectionKind Kind, GOFF::ESDSymbolType SymbolType,
-                          StringRef Name, GOFF::SDAttr SDAttributes,
-                          GOFF::EDAttr EDAttributes, GOFF::PRAttr PRAttributes,
-                          MCSection *Parent) {
-  GOFFSectionKey T{Name, SymbolType};
+template <typename TAttr>
+MCSectionGOFF *MCContext::getGOFFSection(SectionKind Kind, StringRef Name,
+                                         TAttr Attributes, MCSection *Parent) {
+  std::string UniqueName(Name);
+  if (Parent) {
+    UniqueName.append("/").append(Parent->getName());
+    if (auto *P = static_cast<MCSectionGOFF *>(Parent)->getParent())
+      UniqueName.append("/").append(P->getName());
+  }
   // Do the lookup. If we don't have a hit, return a new section.
-  auto IterBool = GOFFUniquingMap.insert(std::make_pair(T, nullptr));
+  auto IterBool = GOFFUniquingMap.insert(std::make_pair(UniqueName, nullptr));
   auto Iter = IterBool.first;
   if (!IterBool.second)
     return Iter->second;
 
-  StringRef CachedName = Iter->first.SectionName;
-  MCSectionGOFF *GOFFSection = new (GOFFAllocator.Allocate())
-      MCSectionGOFF(CachedName, Kind, SymbolType, SDAttributes, EDAttributes,
-                    PRAttributes, static_cast<MCSectionGOFF *>(Parent));
+  StringRef CachedName = StringRef(Iter->first.c_str(), Name.size());
+  MCSectionGOFF *GOFFSection = new (GOFFAllocator.Allocate()) MCSectionGOFF(
+      CachedName, Kind, Attributes, static_cast<MCSectionGOFF *>(Parent));
   Iter->second = GOFFSection;
   allocInitialFragment(*GOFFSection);
   return GOFFSection;
 }
 
 MCSectionGOFF *MCContext::getGOFFSection(SectionKind Kind, StringRef Name,
                                          GOFF::SDAttr SDAttributes) {
-  return getGOFFSection(Kind, GOFF::ESD_ST_SectionDefinition, Name,
-                        SDAttributes, GOFF::EDAttr{}, GOFF::PRAttr{}, nullptr);
+  return getGOFFSection<GOFF::SDAttr>(Kind, Name, SDAttributes, nullptr);
 }
 
 MCSectionGOFF *MCContext::getGOFFSection(SectionKind Kind, StringRef Name,
                                          GOFF::EDAttr EDAttributes,
                                          MCSection *Parent) {
-  return getGOFFSection(Kind, GOFF::ESD_ST_ElementDefinition, Name,
-                        GOFF::SDAttr{}, EDAttributes, GOFF::PRAttr{}, Parent);
+  return getGOFFSection<GOFF::EDAttr>(Kind, Name, EDAttributes, Parent);
 }
 
 MCSectionGOFF *MCContext::getGOFFSection(SectionKind Kind, StringRef Name,
                                          GOFF::PRAttr PRAttributes,
                                          MCSection *Parent) {
-  return getGOFFSection(Kind, GOFF::ESD_ST_PartReference, Name, GOFF::SDAttr{},
-                        GOFF::EDAttr{}, PRAttributes, Parent);
+  return getGOFFSection<GOFF::PRAttr>(Kind, Name, PRAttributes, Parent);
 }
 
 MCSectionCOFF *MCContext::getCOFFSection(StringRef Section,

llvm/test/CodeGen/SystemZ/zos-landingpad.ll

@@ -38,5 +38,5 @@ lpad:
 ; CHECK: LSDA location
 ; Check that the exception table is emitted into .lsda section.
 ; CHECK:  stdin#C CSECT
-; CHECK:  C_WSA64 CATTR ALIGN(2),DEFLOAD,RMODE(64),PART(.gcc_exception_table.test1)
+; CHECK:  C_WSA64 CATTR ALIGN(2),RMODE(64),PART(.gcc_exception_table.test1)
 ; CHECK: GCC_except_table0: