[llvm] r242733 - Revert "ARM: Use SpecificBumpPtrAllocator to fix leak introduced in r241920"

[Matthias Braun]

Author: matze
Date: Mon Jul 20 18:17:14 2015
New Revision: 242733

URL: http://llvm.org/viewvc/llvm-project?rev=242733&view=rev
Log:
Revert "ARM: Use SpecificBumpPtrAllocator to fix leak introduced in r241920"

This reverts commit r241951. It caused http://llvm.org/PR24190

Modified:
    llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp

Modified: llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp?rev=242733&r1=242732&r2=242733&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp Mon Jul 20 18:17:14 2015
@@ -116,7 +116,7 @@ namespace {
       /// Whether the instructions can be merged into a ldrd/strd instruction.
       bool CanMergeToLSDouble;
     };
-    SpecificBumpPtrAllocator<MergeCandidate> Allocator;
+    BumpPtrAllocator Allocator;
     SmallVector<const MergeCandidate*,4> Candidates;
     SmallVector<MachineInstr*,4> MergeBaseCandidates;
 
@@ -979,7 +979,7 @@ void ARMLoadStoreOpt::FormCandidates(con
     }
 
     // Form a candidate from the Ops collected so far.
-    MergeCandidate *Candidate = new(Allocator.Allocate()) MergeCandidate;
+    MergeCandidate *Candidate = new(Allocator) MergeCandidate;
     for (unsigned C = SIndex, CE = SIndex + Count; C < CE; ++C)
       Candidate->Instrs.push_back(MemOps[C].MI);
     Candidate->LatestMIIdx = Latest - SIndex;
@@ -1825,7 +1825,7 @@ bool ARMLoadStoreOpt::runOnMachineFuncti
       Modified |= MergeReturnIntoLDM(MBB);
   }
 
-  Allocator.DestroyAll();
+  Allocator.Reset();
   return Modified;
 }