6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-29 10:32:47 +00:00
Code Issues Projects Releases Wiki Activity

Reapply r99881 with some fixes: only call destructor in releaseMemory!

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@99883 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Torok Edwin 2010-03-30 11:17:48 +00:00
parent 226dd2ba99
commit 01cb1b665d
5 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/llvm/CodeGen/LiveInterval.h
View File

@ -330,12 +330,7 @@ namespace llvm {
}
void clear() {
while (!valnos.empty()) {
VNInfo *VNI = valnos.back();
valnos.pop_back();
VNI->~VNInfo();
}
valnos.clear();
ranges.clear();
}

6
include/llvm/Support/Allocator.h
View File

@ -134,6 +134,7 @@ class BumpPtrAllocator {
static MallocSlabAllocator DefaultSlabAllocator;
public:
typedef void (*DTorFunction)(void*);
BumpPtrAllocator(size_t size = 4096, size_t threshold = 4096,
SlabAllocator &allocator = DefaultSlabAllocator);
~BumpPtrAllocator();
@ -142,6 +143,11 @@ public:
/// to the beginning of it, freeing all memory allocated so far.
void Reset();
/// Reset - like Reset(), but call DTorFunction for each allocated
/// object. This assumes that all objects allocated with this allocator
/// had the same size and alignment specified here.
void Reset(size_t Size, size_t Alignment, DTorFunction DTor);
/// Allocate - Allocate space at the specified alignment.
///
void *Allocate(size_t Size, size_t Alignment);

5
lib/CodeGen/LiveInterval.cpp
View File

@ -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);

7
lib/CodeGen/LiveIntervalAnalysis.cpp
View File

@ -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();

15
lib/Support/Allocator.cpp
View File

@ -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) {