enumerate BB's separately from other function values.

llvm-svn: 36467
This commit is contained in:
Chris Lattner 2007-04-26 04:42:16 +00:00
parent e05f0e1e67
commit 0a07635bdd
2 changed files with 16 additions and 4 deletions

View File

@ -178,11 +178,12 @@ void ValueEnumerator::incorporateFunction(const Function &F) {
isa<InlineAsm>(*OI))
EnumerateValue(*OI);
}
ValueMap[BB] = BasicBlocks.size();
BasicBlocks.push_back(BB);
}
// Add all of the instructions.
for (Function::const_iterator BB = F.begin(), E = F.end(); BB != E; ++BB) {
EnumerateValue(BB);
for (BasicBlock::const_iterator I = BB->begin(), E = BB->end(); I!=E; ++I) {
if (I->getType() != Type::VoidTy)
EnumerateValue(I);
@ -194,6 +195,10 @@ void ValueEnumerator::purgeFunction() {
/// Remove purged values from the ValueMap.
for (unsigned i = ModuleLevel, e = Values.size(); i != e; ++i)
ValueMap.erase(Values[i].first);
for (unsigned i = 0, e = BasicBlocks.size(); i != e; ++i)
ValueMap.erase(BasicBlocks[i]);
Values.resize(ModuleLevel);
BasicBlocks.clear();
}

View File

@ -19,13 +19,13 @@
namespace llvm {
class Value;
class Type;
class Module;
class Value;
class BasicBlock;
class Function;
class Module;
class TypeSymbolTable;
class ValueSymbolTable;
class ConstantArray;
class ValueEnumerator {
public:
@ -43,6 +43,10 @@ private:
ValueMapType ValueMap;
ValueList Values;
/// BasicBlocks - This contains all the basic blocks for the currently
/// incorporated function. Their reverse mapping is stored in ValueMap.
std::vector<const BasicBlock*> BasicBlocks;
/// When a function is incorporated, this is the size of the Values list
/// before incorporation.
unsigned ModuleLevel;
@ -66,6 +70,9 @@ public:
const ValueList &getValues() const { return Values; }
const TypeList &getTypes() const { return Types; }
const std::vector<const BasicBlock*> &getBasicBlocks() const {
return BasicBlocks;
}
/// PurgeAggregateValues - If there are any aggregate values at the end of the
/// value list, remove them and return the count of the remaining values. If