fix MCSectionELF to not leak memory, just like I did for MCSymbol.

MCSectionMachO is already fine (yay for fixed size arrays?),
MCSectionCOFF still leaks.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@98537 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/MC/MCSection.h b/include/llvm/MC/MCSection.h
index ceb6d278c9c0bf4a3905450269f93c219be9670e..3d8815a7783fb16755e321303ae4c72d9ab73674 100644 (file)
--- a/include/llvm/MC/MCSection.h
+++ b/include/llvm/MC/MCSection.h
@@ -42,6 +42,8 @@ namespace llvm {
   };
 
   class MCSectionCOFF : public MCSection {
+    // FIXME: This memory is leaked because MCSectionCOFF is bump pointer
+    // allocated and this never gets freed.
     std::string Name;
     
     /// IsDirective - This is true if the section name is a directive, not

diff --git a/include/llvm/MC/MCSectionELF.h b/include/llvm/MC/MCSectionELF.h
index 2dccf5c57286473c10d5f7ce96de1d22b1137e42..41c17bd8fa187d476cb832f7af54e44e36421f65 100644 (file)
--- a/include/llvm/MC/MCSectionELF.h
+++ b/include/llvm/MC/MCSectionELF.h
@@ -21,7 +21,9 @@ namespace llvm {
 /// MCSectionELF - This represents a section on linux, lots of unix variants
 /// and some bare metal systems.
 class MCSectionELF : public MCSection {
-  std::string SectionName;
+  /// SectionName - This is the name of the section.  The referenced memory is
+  /// owned by TargetLoweringObjectFileELF's ELFUniqueMap.
+  StringRef SectionName;
   
   /// Type - This is the sh_type field of a section, drawn from the enums below.
   unsigned Type;
@@ -163,10 +165,7 @@ public:
     TARGET_INDEP_SHF     = FIRST_TARGET_DEP_FLAG-1U
   };
 
-  StringRef getSectionName() const {
-    return StringRef(SectionName);
-  }
-  
+  StringRef getSectionName() const { return SectionName; }
   unsigned getType() const { return Type; }
   unsigned getFlags() const { return Flags; }
   

diff --git a/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
index 788bbf119088d80588a3cc6ba884f6afc24ec73e..05e0ea8dfc1c5ff494c2da28770a9337d32054be 100644 (file)
--- a/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
+++ b/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
@@ -53,11 +53,13 @@ getELFSection(StringRef Section, unsigned Type, unsigned Flags,
   ELFUniqueMapTy &Map = *(ELFUniqueMapTy*)UniquingMap;
 
   // Do the lookup, if we have a hit, return it.
-  const MCSectionELF *&Entry = Map[Section];
-  if (Entry) return Entry;
+  StringMapEntry<const MCSectionELF*> &Entry = Map.GetOrCreateValue(Section);
+  if (Entry.getValue()) return Entry.getValue();
 
-  return Entry = MCSectionELF::Create(Section, Type, Flags, Kind, IsExplicit,
-                                      getContext());
+  MCSectionELF *Result = MCSectionELF::Create(Entry.getKey(), Type, Flags, Kind,
+                                              IsExplicit, getContext());
+  Entry.setValue(Result);
+  return Result;
 }
 
 void TargetLoweringObjectFileELF::Initialize(MCContext &Ctx,