Index: ELF/InputFiles.h
===================================================================
--- ELF/InputFiles.h
+++ ELF/InputFiles.h
@@ -37,21 +37,6 @@
 namespace lld {
 namespace elf {
 
-template <class ELFT> struct GAlloc {
-  static llvm::SpecificBumpPtrAllocator<InputSection<ELFT>> IAlloc;
-  static llvm::SpecificBumpPtrAllocator<MergeInputSection<ELFT>> MAlloc;
-  static llvm::SpecificBumpPtrAllocator<EhInputSection<ELFT>> EHAlloc;
-};
-
-template <class ELFT>
-llvm::SpecificBumpPtrAllocator<InputSection<ELFT>> GAlloc<ELFT>::IAlloc;
-
-template <class ELFT>
-llvm::SpecificBumpPtrAllocator<MergeInputSection<ELFT>> GAlloc<ELFT>::MAlloc;
-
-template <class ELFT>
-llvm::SpecificBumpPtrAllocator<EhInputSection<ELFT>> GAlloc<ELFT>::EHAlloc;
-
 using llvm::object::Archive;
 
 class InputFile;
Index: ELF/InputFiles.cpp
===================================================================
--- ELF/InputFiles.cpp
+++ ELF/InputFiles.cpp
@@ -387,7 +387,7 @@
     // If -r is given, we do not interpret or apply relocation
     // but just copy relocation sections to output.
     if (Config->Relocatable)
-      return new (GAlloc<ELFT>::IAlloc.Allocate())
+      return new (alloc<InputSection<ELFT>>())
           InputSection<ELFT>(this, &Sec, Name);
 
     // Find the relocation target section and associate this
@@ -430,14 +430,13 @@
   // .eh_frame_hdr section for runtime. So we handle them with a special
   // class. For relocatable outputs, they are just passed through.
   if (Name == ".eh_frame" && !Config->Relocatable)
-    return new (GAlloc<ELFT>::EHAlloc.Allocate())
+    return new (alloc<EhInputSection<ELFT>>())
         EhInputSection<ELFT>(this, &Sec, Name);
 
   if (shouldMerge(Sec))
-    return new (GAlloc<ELFT>::MAlloc.Allocate())
+    return new (alloc<MergeInputSection<ELFT>>())
         MergeInputSection<ELFT>(this, &Sec, Name);
-  return new (GAlloc<ELFT>::IAlloc.Allocate())
-      InputSection<ELFT>(this, &Sec, Name);
+  return new (alloc<InputSection<ELFT>>()) InputSection<ELFT>(this, &Sec, Name);
 }
 
 template <class ELFT> void elf::ObjectFile<ELFT>::initializeSymbols() {
Index: ELF/Memory.h
===================================================================
--- ELF/Memory.h
+++ ELF/Memory.h
@@ -24,12 +24,36 @@
 
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/StringSaver.h"
+#include <vector>
 
 namespace lld {
 namespace elf {
+
+// Use this arena if your object doesn't have a destructor.
 extern llvm::BumpPtrAllocator BAlloc;
 extern llvm::StringSaver Saver;
 
+// These two classes are hack to keep track of all
+// SpecificBumpPtrAllocator instances.
+struct SpecificAllocBase {
+  SpecificAllocBase();
+  virtual ~SpecificAllocBase() = default;
+  virtual void reset() = 0;
+  static std::vector<SpecificAllocBase *> Instances;
+};
+
+template <class T> struct SpecificAlloc : public SpecificAllocBase {
+  void reset() override { Alloc.DestroyAll(); }
+  llvm::SpecificBumpPtrAllocator<T> Alloc;
+};
+
+// Use this arean if your object have a destructor.
+// Your destructor will be invoked from freeArena().
+template <class T> static T *alloc() {
+  static SpecificAlloc<T> Alloc;
+  return Alloc.Alloc.Allocate();
+}
+
 void freeArena();
 }
 }
Index: ELF/Memory.cpp
===================================================================
--- ELF/Memory.cpp
+++ ELF/Memory.cpp
@@ -9,7 +9,19 @@
 
 #include "Memory.h"
 
-llvm::BumpPtrAllocator lld::elf::BAlloc;
-llvm::StringSaver lld::elf::Saver{BAlloc};
+using namespace llvm;
+using namespace lld;
+using namespace lld::elf;
 
-void lld::elf::freeArena() { BAlloc.Reset(); }
+BumpPtrAllocator elf::BAlloc;
+StringSaver elf::Saver{BAlloc};
+
+SpecificAllocBase::SpecificAllocBase() { Instances.push_back(this); }
+
+std::vector<SpecificAllocBase *> SpecificAllocBase::Instances;
+
+void elf::freeArena() {
+  for (SpecificAllocBase *Alloc : SpecificAllocBase::Instances)
+    Alloc->reset();
+  BAlloc.Reset();
+}