diff options
author | Torok Edwin <edwintorok@gmail.com> | 2010-03-30 11:17:48 +0000 |
---|---|---|
committer | Torok Edwin <edwintorok@gmail.com> | 2010-03-30 11:17:48 +0000 |
commit | 01cb1b665da03e2b74c0724f71751e912ec8c2be (patch) | |
tree | b3b4b991b3f6b97a7d9e8070dc6312dcd60fccce /lib | |
parent | 226dd2ba992b1f00491c10c59ca1889825bf92b6 (diff) | |
download | llvm-01cb1b665da03e2b74c0724f71751e912ec8c2be.tar.gz llvm-01cb1b665da03e2b74c0724f71751e912ec8c2be.tar.bz2 llvm-01cb1b665da03e2b74c0724f71751e912ec8c2be.tar.xz |
Reapply r99881 with some fixes: only call destructor in releaseMemory!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@99883 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/CodeGen/LiveInterval.cpp | 5 | ||||
-rw-r--r-- | lib/CodeGen/LiveIntervalAnalysis.cpp | 7 | ||||
-rw-r--r-- | lib/Support/Allocator.cpp | 15 |
3 files changed, 21 insertions, 6 deletions
diff --git a/lib/CodeGen/LiveInterval.cpp b/lib/CodeGen/LiveInterval.cpp index e207f607da..7af25dd7e8 100644 --- a/lib/CodeGen/LiveInterval.cpp +++ b/lib/CodeGen/LiveInterval.cpp @@ -305,7 +305,6 @@ void LiveInterval::removeRange(SlotIndex Start, SlotIndex End, do { VNInfo *VNI = valnos.back(); valnos.pop_back(); - VNI->~VNInfo(); } while (!valnos.empty() && valnos.back()->isUnused()); } else { ValNo->setIsUnused(true); @@ -353,7 +352,6 @@ void LiveInterval::removeValNo(VNInfo *ValNo) { do { VNInfo *VNI = valnos.back(); valnos.pop_back(); - VNI->~VNInfo(); } while (!valnos.empty() && valnos.back()->isUnused()); } else { ValNo->setIsUnused(true); @@ -581,7 +579,6 @@ void LiveInterval::MergeValueInAsValue( do { VNInfo *VNI = valnos.back(); valnos.pop_back(); - VNI->~VNInfo(); } while (!valnos.empty() && valnos.back()->isUnused()); } else { V1->setIsUnused(true); @@ -658,7 +655,6 @@ void LiveInterval::MergeInClobberRanges(LiveIntervals &li_, if (UnusedValNo) { // Delete the last unused val#. valnos.pop_back(); - UnusedValNo->~VNInfo(); } } @@ -751,7 +747,6 @@ VNInfo* LiveInterval::MergeValueNumberInto(VNInfo *V1, VNInfo *V2) { do { VNInfo *VNI = valnos.back(); valnos.pop_back(); - VNI->~VNInfo(); } while (valnos.back()->isUnused()); } else { V1->setIsUnused(true); diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp index e657c46c72..53366b9f07 100644 --- a/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -82,6 +82,11 @@ void LiveIntervals::getAnalysisUsage(AnalysisUsage &AU) const { MachineFunctionPass::getAnalysisUsage(AU); } +static void VNInfoDTor(void* Ptr) +{ + reinterpret_cast<VNInfo*>(Ptr)->~VNInfo(); +} + void LiveIntervals::releaseMemory() { // Free the live intervals themselves. for (DenseMap<unsigned, LiveInterval*>::iterator I = r2iMap_.begin(), @@ -91,7 +96,7 @@ void LiveIntervals::releaseMemory() { r2iMap_.clear(); // Release VNInfo memroy regions after all VNInfo objects are dtor'd. - VNInfoAllocator.Reset(); + VNInfoAllocator.Reset((unsigned)sizeof(VNInfo), alignof<VNInfo>(), VNInfoDTor); while (!CloneMIs.empty()) { MachineInstr *MI = CloneMIs.back(); CloneMIs.pop_back(); diff --git a/lib/Support/Allocator.cpp b/lib/Support/Allocator.cpp index 31b45c8d4a..7433247c23 100644 --- a/lib/Support/Allocator.cpp +++ b/lib/Support/Allocator.cpp @@ -78,6 +78,21 @@ void BumpPtrAllocator::Reset() { End = ((char*)CurSlab) + CurSlab->Size; } +void BumpPtrAllocator::Reset(size_t Size, size_t Alignment, DTorFunction DTor) { + if (Alignment == 0) Alignment = 1; + MemSlab *Slab = CurSlab; + while (Slab) { + char *End = Slab == CurSlab ? CurPtr : (char*)Slab + Slab->Size; + for (char *Ptr = (char*)Slab+1; Ptr < End; Ptr += Size) { + Ptr = AlignPtr(Ptr, Alignment); + if (Ptr + Size <= End) + DTor(Ptr); + } + Slab = Slab->NextPtr; + } + Reset(); +} + /// Allocate - Allocate space at the specified alignment. /// void *BumpPtrAllocator::Allocate(size_t Size, size_t Alignment) { |