2 files changed, 13 insertions, 1 deletions
diff --git a/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp b/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp
index 41c8c22891..9f41455797 100644
--- a/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp
+++ b/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp
@@ -3130,6 +3130,13 @@ static const DisassembleFP FuncPtrs[] = {
 /// Algorithms - Algorithms stores a map from Format to ARMAlgorithm*.
 static std::vector<ARMAlgorithm*> Algorithms;
 
+/// DoCleanup - Do cleanup of Algorithms upon exit.
+void ARMAlgorithm::DoCleanup() {
+  for (unsigned i = 0; i < array_lengthof(FuncPtrs); ++i)
+    if (Algorithms[i])
+      delete Algorithms[i];
+}
+
 /// GetInstance - GetInstance returns an instance of ARMAlgorithm given the
 /// encoding Format.  API clients should not free up the returned instance.
 ARMAlgorithm *ARMAlgorithm::GetInstance(ARMFormat Format) {
@@ -3141,11 +3148,13 @@ ARMAlgorithm *ARMAlgorithm::GetInstance(ARMFormat Format) {
         Algorithms[i] = new ARMAlgorithm(FuncPtrs[i]);
       else
         Algorithms[i] = NULL;
+
+    // Register cleanup routine.
+    atexit(DoCleanup);
   }
   return Algorithms[Format];
 }
 
-
 /// BuildIt - BuildIt performs the build step for this ARM Basic MC Builder.
 /// The general idea is to set the Opcode for the MCInst, followed by adding
 /// the appropriate MCOperands to the MCInst.  ARM Basic MC Builder delegates
diff --git a/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h b/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h
index 1409a120e4..6d742512f8 100644
--- a/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h
+++ b/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h
@@ -181,6 +181,9 @@ public:
   /// encoding Format.  API clients should not free up the returned instance.
   static ARMAlgorithm *GetInstance(ARMFormat Format);
 
+  /// DoCleanup - DoCleanup is meant to be called upon exit as an exit handler.
+  static void DoCleanup();
+
   /// Return true if this algorithm successfully disassembles the instruction.
   /// NumOpsAdded is updated to reflect the number of operands added by the
   /// algorithm.  NumOpsAdded may be less than NumOps, in which case, there are