X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FVMCore%2FBasicBlock.cpp;h=bf7191c659328fa5435731abd9cf756c277f0e4a;hb=f90a0e4bd7c99788d85655e9f52c63a3a58f7431;hp=9a6301eb0162accc273d55cbf6e42e108682fbc8;hpb=87a09b10f8e03182e9edcb6e9ee8386f4a5d8dae;p=oota-llvm.git diff --git a/lib/VMCore/BasicBlock.cpp b/lib/VMCore/BasicBlock.cpp index 9a6301eb016..bf7191c6593 100644 --- a/lib/VMCore/BasicBlock.cpp +++ b/lib/VMCore/BasicBlock.cpp @@ -1,32 +1,85 @@ -//===-- BasicBlock.cpp - Implement BasicBlock related functions --*- C++ -*--=// +//===-- BasicBlock.cpp - Implement BasicBlock related methods -------------===// // // This file implements the BasicBlock class for the VMCore library. // //===----------------------------------------------------------------------===// -#include "ValueHolderImpl.h" +#include "llvm/BasicBlock.h" #include "llvm/iTerminators.h" #include "llvm/Type.h" #include "llvm/Support/CFG.h" +#include "llvm/Constant.h" #include "llvm/iPHINode.h" -#include "llvm/CodeGen/MachineInstr.h" +#include "llvm/SymbolTable.h" +#include "Support/LeakDetector.h" +#include "SymbolTableListTraitsImpl.h" +#include -// Instantiate Templates - This ugliness is the price we have to pay -// for having a ValueHolderImpl.h file seperate from ValueHolder.h! :( +// DummyInst - An instance of this class is used to mark the end of the +// instruction list. This is not a real instruction. // -template class ValueHolder; +struct DummyInst : public Instruction { + DummyInst() : Instruction(Type::VoidTy, NumOtherOps) { + // This should not be garbage monitored. + LeakDetector::removeGarbageObject(this); + } + + virtual Instruction *clone() const { + assert(0 && "Cannot clone EOL");abort(); + return 0; + } + virtual const char *getOpcodeName() const { return "*end-of-list-inst*"; } + + // Methods for support type inquiry through isa, cast, and dyn_cast... + static inline bool classof(const DummyInst *) { return true; } + static inline bool classof(const Instruction *I) { + return I->getOpcode() == NumOtherOps; + } + static inline bool classof(const Value *V) { + return isa(V) && classof(cast(V)); + } +}; +Instruction *ilist_traits::createNode() { + return new DummyInst(); +} +iplist &ilist_traits::getList(BasicBlock *BB) { + return BB->getInstList(); +} + +// Explicit instantiation of SymbolTableListTraits since some of the methods +// are not in the public header file... +template SymbolTableListTraits; + + +// BasicBlock ctor - If the function parameter is specified, the basic block is +// automatically inserted at the end of the function. +// BasicBlock::BasicBlock(const std::string &name, Function *Parent) - : Value(Type::LabelTy, Value::BasicBlockVal, name), InstList(this, 0), - machineInstrVec(new MachineCodeForBasicBlock) { + : Value(Type::LabelTy, Value::BasicBlockVal, name) { + // Initialize the instlist... + InstList.setItemParent(this); + + // Make sure that we get added to a function + LeakDetector::addGarbageObject(this); + if (Parent) - Parent->getBasicBlocks().push_back(this); + Parent->getBasicBlockList().push_back(this); } BasicBlock::~BasicBlock() { dropAllReferences(); - InstList.delete_all(); - delete machineInstrVec; + InstList.clear(); +} + +void BasicBlock::setParent(Function *parent) { + if (getParent()) + LeakDetector::addGarbageObject(this); + + InstList.setParent(parent); + + if (getParent()) + LeakDetector::removeGarbageObject(this); } // Specialize setName to take care of symbol table majik @@ -39,33 +92,19 @@ void BasicBlock::setName(const std::string &name, SymbolTable *ST) { if (P && hasName()) P->getSymbolTable()->insert(this); } -void BasicBlock::setParent(Function *parent) { - if (getParent() && hasName()) - getParent()->getSymbolTable()->remove(this); - - InstList.setParent(parent); - - if (getParent() && hasName()) - getParent()->getSymbolTableSure()->insert(this); -} - TerminatorInst *BasicBlock::getTerminator() { if (InstList.empty()) return 0; - Instruction *T = InstList.back(); - if (isa(T)) return cast(T); - return 0; + return dyn_cast(&InstList.back()); } const TerminatorInst *const BasicBlock::getTerminator() const { if (InstList.empty()) return 0; - if (const TerminatorInst *TI = dyn_cast(InstList.back())) - return TI; - return 0; + return dyn_cast(&InstList.back()); } void BasicBlock::dropAllReferences() { - for_each(InstList.begin(), InstList.end(), - std::mem_fun(&Instruction::dropAllReferences)); + for(iterator I = begin(), E = end(); I != E; ++I) + I->dropAllReferences(); } // hasConstantReferences() - This predicate is true if there is a @@ -122,7 +161,7 @@ void BasicBlock::removePredecessor(BasicBlock *Pred) { if (max_idx <= 2) { // <= Two predecessors BEFORE I remove one? // Yup, loop through and nuke the PHI nodes - while (PHINode *PN = dyn_cast(front())) { + while (PHINode *PN = dyn_cast(&front())) { PN->removeIncomingValue(Pred); // Remove the predecessor first... assert(PN->getNumIncomingValues() == max_idx-1 && @@ -131,12 +170,14 @@ void BasicBlock::removePredecessor(BasicBlock *Pred) { // If the PHI _HAD_ two uses, replace PHI node with its now *single* value if (max_idx == 2) PN->replaceAllUsesWith(PN->getOperand(0)); - delete getInstList().remove(begin()); // Remove the PHI node + else // Otherwise there are no incoming values/edges, replace with dummy + PN->replaceAllUsesWith(Constant::getNullValue(PN->getType())); + getInstList().pop_front(); // Remove the PHI node } } else { // Okay, now we know that we need to remove predecessor #pred_idx from all // PHI nodes. Iterate over each PHI node fixing them up - for (iterator II = begin(); PHINode *PN = dyn_cast(*II); ++II) + for (iterator II = begin(); PHINode *PN = dyn_cast(&*II); ++II) PN->removeIncomingValue(Pred); } } @@ -167,7 +208,7 @@ BasicBlock *BasicBlock::splitBasicBlock(iterator I) { iterator EndIt = end(); Inst = InstList.remove(--EndIt); // Remove from end New->InstList.push_front(Inst); // Add to front - } while (Inst != *I); // Loop until we move the specified instruction. + } while (Inst != &*I); // Loop until we move the specified instruction. // Add a branch instruction to the newly formed basic block. InstList.push_back(new BranchInst(New)); @@ -183,7 +224,7 @@ BasicBlock *BasicBlock::splitBasicBlock(iterator I) { // incoming values... BasicBlock *Successor = *I; for (BasicBlock::iterator II = Successor->begin(); - PHINode *PN = dyn_cast(*II); ++II) { + PHINode *PN = dyn_cast(&*II); ++II) { int IDX = PN->getBasicBlockIndex(this); while (IDX != -1) { PN->setIncomingBlock((unsigned)IDX, New);