Use std::unique_ptr to manage MCBasicBlocks in MCFunction.
llvm-svn: 206242
This commit is contained in:
parent
a1bc0f5662
commit
4a7a050910
|
@ -17,6 +17,7 @@
|
||||||
|
|
||||||
#include "llvm/ADT/StringRef.h"
|
#include "llvm/ADT/StringRef.h"
|
||||||
#include "llvm/MC/MCInst.h"
|
#include "llvm/MC/MCInst.h"
|
||||||
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
@ -88,13 +89,12 @@ class MCFunction {
|
||||||
|
|
||||||
std::string Name;
|
std::string Name;
|
||||||
MCModule *ParentModule;
|
MCModule *ParentModule;
|
||||||
typedef std::vector<MCBasicBlock*> BasicBlockListTy;
|
typedef std::vector<std::unique_ptr<MCBasicBlock>> BasicBlockListTy;
|
||||||
BasicBlockListTy Blocks;
|
BasicBlockListTy Blocks;
|
||||||
|
|
||||||
// MCModule owns the function.
|
// MCModule owns the function.
|
||||||
friend class MCModule;
|
friend class MCModule;
|
||||||
MCFunction(StringRef Name, MCModule *Parent);
|
MCFunction(StringRef Name, MCModule *Parent);
|
||||||
~MCFunction();
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/// \brief Create an MCBasicBlock backed by Insts and add it to this function.
|
/// \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(); }
|
const_iterator end() const { return Blocks.end(); }
|
||||||
iterator end() { return Blocks.end(); }
|
iterator end() { return Blocks.end(); }
|
||||||
|
|
||||||
const MCBasicBlock* front() const { return Blocks.front(); }
|
const MCBasicBlock* front() const { return Blocks.front().get(); }
|
||||||
MCBasicBlock* front() { return Blocks.front(); }
|
MCBasicBlock* front() { return Blocks.front().get(); }
|
||||||
const MCBasicBlock* back() const { return Blocks.back(); }
|
const MCBasicBlock* back() const { return Blocks.back().get(); }
|
||||||
MCBasicBlock* back() { return Blocks.back(); }
|
MCBasicBlock* back() { return Blocks.back().get(); }
|
||||||
|
|
||||||
/// \brief Find the basic block, if any, that starts at \p StartAddr.
|
/// \brief Find the basic block, if any, that starts at \p StartAddr.
|
||||||
const MCBasicBlock *find(uint64_t StartAddr) const;
|
const MCBasicBlock *find(uint64_t StartAddr) const;
|
||||||
|
|
|
@ -20,21 +20,16 @@ MCFunction::MCFunction(StringRef Name, MCModule *Parent)
|
||||||
: Name(Name), ParentModule(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 &MCFunction::createBlock(const MCTextAtom &TA) {
|
||||||
MCBasicBlock *MCBB = new MCBasicBlock(TA, this);
|
std::unique_ptr<MCBasicBlock> MCBB(new MCBasicBlock(TA, this));
|
||||||
Blocks.push_back(MCBB);
|
Blocks.push_back(std::move(MCBB));
|
||||||
return *MCBB;
|
return *Blocks.back();
|
||||||
}
|
}
|
||||||
|
|
||||||
MCBasicBlock *MCFunction::find(uint64_t StartAddr) {
|
MCBasicBlock *MCFunction::find(uint64_t StartAddr) {
|
||||||
for (const_iterator I = begin(), E = end(); I != E; ++I)
|
for (const_iterator I = begin(), E = end(); I != E; ++I)
|
||||||
if ((*I)->getInsts()->getBeginAddr() == StartAddr)
|
if ((*I)->getInsts()->getBeginAddr() == StartAddr)
|
||||||
return *I;
|
return I->get();
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -336,16 +336,16 @@ void MCModule2YAML::dumpFunction(const MCFunction *MCF) {
|
||||||
F.Name = MCF->getName();
|
F.Name = MCF->getName();
|
||||||
for (MCFunction::const_iterator BBI = MCF->begin(), BBE = MCF->end();
|
for (MCFunction::const_iterator BBI = MCF->begin(), BBE = MCF->end();
|
||||||
BBI != BBE; ++BBI) {
|
BBI != BBE; ++BBI) {
|
||||||
const MCBasicBlock *MCBB = *BBI;
|
const MCBasicBlock &MCBB = **BBI;
|
||||||
F.BasicBlocks.resize(F.BasicBlocks.size() + 1);
|
F.BasicBlocks.resize(F.BasicBlocks.size() + 1);
|
||||||
MCModuleYAML::BasicBlock &BB = F.BasicBlocks.back();
|
MCModuleYAML::BasicBlock &BB = F.BasicBlocks.back();
|
||||||
BB.Address = MCBB->getInsts()->getBeginAddr();
|
BB.Address = MCBB.getInsts()->getBeginAddr();
|
||||||
for (MCBasicBlock::pred_const_iterator PI = MCBB->pred_begin(),
|
for (MCBasicBlock::pred_const_iterator PI = MCBB.pred_begin(),
|
||||||
PE = MCBB->pred_end();
|
PE = MCBB.pred_end();
|
||||||
PI != PE; ++PI)
|
PI != PE; ++PI)
|
||||||
BB.Preds.push_back((*PI)->getInsts()->getBeginAddr());
|
BB.Preds.push_back((*PI)->getInsts()->getBeginAddr());
|
||||||
for (MCBasicBlock::succ_const_iterator SI = MCBB->succ_begin(),
|
for (MCBasicBlock::succ_const_iterator SI = MCBB.succ_begin(),
|
||||||
SE = MCBB->succ_end();
|
SE = MCBB.succ_end();
|
||||||
SI != SE; ++SI)
|
SI != SE; ++SI)
|
||||||
BB.Succs.push_back((*SI)->getInsts()->getBeginAddr());
|
BB.Succs.push_back((*SI)->getInsts()->getBeginAddr());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue