6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-23 20:29:30 +00:00
Code Issues Projects Releases Wiki Activity

Revert "ARM: Use SpecificBumpPtrAllocator to fix leak introduced in r241920"

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@242733 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Matthias Braun 2015-07-20 23:17:14 +00:00
parent f4f0f405c8
commit 2271d686de
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Target/ARM/ARMLoadStoreOptimizer.cpp
View File

@ -116,7 +116,7 @@ namespace {
/// Whether the instructions can be merged into a ldrd/strd instruction. /// Whether the instructions can be merged into a ldrd/strd instruction.
bool CanMergeToLSDouble; bool CanMergeToLSDouble;
}; };
SpecificBumpPtrAllocator<MergeCandidate> Allocator; BumpPtrAllocator Allocator;
SmallVector<const MergeCandidate*,4> Candidates; SmallVector<const MergeCandidate*,4> Candidates;
SmallVector<MachineInstr*,4> MergeBaseCandidates; SmallVector<MachineInstr*,4> MergeBaseCandidates;
@ -979,7 +979,7 @@ void ARMLoadStoreOpt::FormCandidates(const MemOpQueue &MemOps) {
} }
// Form a candidate from the Ops collected so far. // 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) for (unsigned C = SIndex, CE = SIndex + Count; C < CE; ++C)
Candidate->Instrs.push_back(MemOps[C].MI); Candidate->Instrs.push_back(MemOps[C].MI);
Candidate->LatestMIIdx = Latest - SIndex; Candidate->LatestMIIdx = Latest - SIndex;
@ -1825,7 +1825,7 @@ bool ARMLoadStoreOpt::runOnMachineFunction(MachineFunction &Fn) {
Modified |= MergeReturnIntoLDM(MBB); Modified |= MergeReturnIntoLDM(MBB);
} }
Allocator.DestroyAll(); Allocator.Reset();
return Modified; return Modified;
} }