Revert "ARM: Use SpecificBumpPtrAllocator to fix leak introduced in r241920"
This reverts commit r241951. It caused http://llvm.org/PR24190
llvm-svn: 242733
diff --git a/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp b/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
index 1bf2c3d..e22adab 100644
--- a/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
+++ b/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
@@ -116,7 +116,7 @@
/// 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 @@
}
// 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 @@
Modified |= MergeReturnIntoLDM(MBB);
}
- Allocator.DestroyAll();
+ Allocator.Reset();
return Modified;
}