6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-28 22:29:56 +00:00
Code Issues Projects Releases Wiki Activity

Remove dynamic allocation/indirection from GCOVBlocks owned by GCOVFunction

Browse Source 
Since these are all created in the DenseMap before they are referenced,
there's no problem with pointer validity by the time it's required. This
removes another use of DeleteContainerSeconds/manual memory management
which I'm cleaning up from time to time.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224744 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie 2014-12-22 23:12:42 +00:00
parent f5a21eaa18
commit b39244dca3
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lib/Transforms/Instrumentation/GCOVProfiling.cpp
View File

@ -285,6 +285,14 @@ namespace {
DeleteContainerSeconds(LinesByFile); DeleteContainerSeconds(LinesByFile);
} }
GCOVBlock(const GCOVBlock &RHS) : GCOVRecord(RHS), Number(RHS.Number) {
// Only allow copy before edges and lines have been added. After that,
// there are inter-block pointers (eg: edges) that won't take kindly to
// blocks being copied or moved around.
assert(LinesByFile.empty());
assert(OutEdges.empty());
}
private: private:
friend class GCOVFunction; friend class GCOVFunction;
@ -303,21 +311,21 @@ namespace {
// object users can construct, the blocks and lines will be rooted here. // object users can construct, the blocks and lines will be rooted here.
class GCOVFunction : public GCOVRecord { class GCOVFunction : public GCOVRecord {
public: public:
GCOVFunction(DISubprogram SP, raw_ostream *os, uint32_t Ident, GCOVFunction(DISubprogram SP, raw_ostream *os, uint32_t Ident,
bool UseCfgChecksum) : bool UseCfgChecksum)
SP(SP), Ident(Ident), UseCfgChecksum(UseCfgChecksum), CfgChecksum(0) { : SP(SP), Ident(Ident), UseCfgChecksum(UseCfgChecksum), CfgChecksum(0),
ReturnBlock(1, os) {
this->os = os; this->os = os;
Function *F = SP.getFunction(); Function *F = SP.getFunction();
DEBUG(dbgs() << "Function: " << getFunctionName(SP) << "\n"); DEBUG(dbgs() << "Function: " << getFunctionName(SP) << "\n");
Function::iterator BB = F->begin(), E = F->end(); uint32_t i = 0;
Blocks[BB++] = new GCOVBlock(0, os); for (auto &BB : *F) {
ReturnBlock = new GCOVBlock(1, os); // Skip index 1 (0, 2, 3, 4, ...) because that's assigned to the
// ReturnBlock.
uint32_t i = 2; bool first = i == 0;
for (; BB != E; ++BB) { Blocks.insert(std::make_pair(&BB, GCOVBlock(i++ + !first, os)));
Blocks[BB] = new GCOVBlock(i++, os);
} }
std::string FunctionNameAndLine; std::string FunctionNameAndLine;
@ -327,17 +335,12 @@ namespace {
FuncChecksum = hash_value(FunctionNameAndLine); FuncChecksum = hash_value(FunctionNameAndLine);
} }
~GCOVFunction() {
DeleteContainerSeconds(Blocks);
delete ReturnBlock;
}
GCOVBlock &getBlock(BasicBlock *BB) { GCOVBlock &getBlock(BasicBlock *BB) {
return *Blocks[BB]; return Blocks.find(BB)->second;
} }
GCOVBlock &getReturnBlock() { GCOVBlock &getReturnBlock() {
return *ReturnBlock; return ReturnBlock;
} }
std::string getEdgeDestinations() { std::string getEdgeDestinations() {
@ -345,7 +348,7 @@ namespace {
raw_string_ostream EDOS(EdgeDestinations); raw_string_ostream EDOS(EdgeDestinations);
Function *F = Blocks.begin()->first->getParent(); Function *F = Blocks.begin()->first->getParent();
for (Function::iterator I = F->begin(), E = F->end(); I != E; ++I) { for (Function::iterator I = F->begin(), E = F->end(); I != E; ++I) {
GCOVBlock &Block = *Blocks[I]; GCOVBlock &Block = getBlock(I);
for (int i = 0, e = Block.OutEdges.size(); i != e; ++i) for (int i = 0, e = Block.OutEdges.size(); i != e; ++i)
EDOS << Block.OutEdges[i]->Number; EDOS << Block.OutEdges[i]->Number;
} }
@ -387,7 +390,7 @@ namespace {
if (Blocks.empty()) return; if (Blocks.empty()) return;
Function *F = Blocks.begin()->first->getParent(); Function *F = Blocks.begin()->first->getParent();
for (Function::iterator I = F->begin(), E = F->end(); I != E; ++I) { for (Function::iterator I = F->begin(), E = F->end(); I != E; ++I) {
GCOVBlock &Block = *Blocks[I]; GCOVBlock &Block = getBlock(I);
if (Block.OutEdges.empty()) continue; if (Block.OutEdges.empty()) continue;
writeBytes(EdgeTag, 4); writeBytes(EdgeTag, 4);
@ -403,7 +406,7 @@ namespace {
// Emit lines for each block. // Emit lines for each block.
for (Function::iterator I = F->begin(), E = F->end(); I != E; ++I) { for (Function::iterator I = F->begin(), E = F->end(); I != E; ++I) {
Blocks[I]->writeOut(); getBlock(I).writeOut();
} }
} }
@ -413,8 +416,8 @@ namespace {
uint32_t FuncChecksum; uint32_t FuncChecksum;
bool UseCfgChecksum; bool UseCfgChecksum;
uint32_t CfgChecksum; uint32_t CfgChecksum;
DenseMap<BasicBlock *, GCOVBlock *> Blocks; DenseMap<BasicBlock *, GCOVBlock> Blocks;
GCOVBlock *ReturnBlock; GCOVBlock ReturnBlock;
}; };
} }