replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use std::unique_ptr to manage MCBasicBlocks in MCFunction. 

llvm-svn: 206242
This commit is contained in:
David Blaikie 2014-04-15 04:56:29 +00:00
parent a1bc0f5662
commit 4a7a050910
3 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/include/llvm/MC/MCFunction.h
View File

@ -17,6 +17,7 @@
#include "llvm/ADT/StringRef.h"
#include "llvm/MC/MCInst.h"
#include <memory>
#include <string>
#include <vector>
@ -88,13 +89,12 @@ class MCFunction {
std::string Name;
MCModule *ParentModule;
typedef std::vector<MCBasicBlock*> BasicBlockListTy;
typedef std::vector<std::unique_ptr<MCBasicBlock>> BasicBlockListTy;
BasicBlockListTy Blocks;
// MCModule owns the function.
friend class MCModule;
MCFunction(StringRef Name, MCModule *Parent);
~MCFunction();
public:
/// \brief Create an MCBasicBlock backed by Insts and add it to this function.
@ -126,10 +126,10 @@ public:
const_iterator end() const { return Blocks.end(); }
iterator end() { return Blocks.end(); }
const MCBasicBlock* front() const { return Blocks.front(); }
MCBasicBlock* front() { return Blocks.front(); }
const MCBasicBlock* back() const { return Blocks.back(); }
MCBasicBlock* back() { return Blocks.back(); }
const MCBasicBlock* front() const { return Blocks.front().get(); }
MCBasicBlock* front() { return Blocks.front().get(); }
const MCBasicBlock* back() const { return Blocks.back().get(); }
MCBasicBlock* back() { return Blocks.back().get(); }
/// \brief Find the basic block, if any, that starts at \p StartAddr.
const MCBasicBlock *find(uint64_t StartAddr) const;

13
llvm/lib/MC/MCFunction.cpp
View File

@ -20,21 +20,16 @@ MCFunction::MCFunction(StringRef Name, MCModule *Parent)
: Name(Name), ParentModule(Parent)
{}
MCFunction::~MCFunction() {
for (iterator I = begin(), E = end(); I != E; ++I)
delete *I;
}
MCBasicBlock &MCFunction::createBlock(const MCTextAtom &TA) {
MCBasicBlock *MCBB = new MCBasicBlock(TA, this);
Blocks.push_back(MCBB);
return *MCBB;
std::unique_ptr<MCBasicBlock> MCBB(new MCBasicBlock(TA, this));
Blocks.push_back(std::move(MCBB));
return *Blocks.back();
}
MCBasicBlock *MCFunction::find(uint64_t StartAddr) {
for (const_iterator I = begin(), E = end(); I != E; ++I)
if ((*I)->getInsts()->getBeginAddr() == StartAddr)
return *I;
return I->get();
return nullptr;
}

12
llvm/lib/MC/MCModuleYAML.cpp
View File

@ -336,16 +336,16 @@ void MCModule2YAML::dumpFunction(const MCFunction *MCF) {
F.Name = MCF->getName();
for (MCFunction::const_iterator BBI = MCF->begin(), BBE = MCF->end();
BBI != BBE; ++BBI) {
const MCBasicBlock *MCBB = *BBI;
const MCBasicBlock &MCBB = **BBI;
F.BasicBlocks.resize(F.BasicBlocks.size() + 1);
MCModuleYAML::BasicBlock &BB = F.BasicBlocks.back();
BB.Address = MCBB->getInsts()->getBeginAddr();
for (MCBasicBlock::pred_const_iterator PI = MCBB->pred_begin(),
PE = MCBB->pred_end();
BB.Address = MCBB.getInsts()->getBeginAddr();
for (MCBasicBlock::pred_const_iterator PI = MCBB.pred_begin(),
PE = MCBB.pred_end();
PI != PE; ++PI)
BB.Preds.push_back((*PI)->getInsts()->getBeginAddr());
for (MCBasicBlock::succ_const_iterator SI = MCBB->succ_begin(),
SE = MCBB->succ_end();
for (MCBasicBlock::succ_const_iterator SI = MCBB.succ_begin(),
SE = MCBB.succ_end();
SI != SE; ++SI)
BB.Succs.push_back((*SI)->getInsts()->getBeginAddr());
}