X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FVMCore%2FValueSymbolTable.cpp;h=e31410c29cd2c913690b322591991dff6c1a8575;hb=dec628eead87b20773c98a00830580df211acc98;hp=358b5a23d0b888c7bfba758eb7dd1c7300971f78;hpb=421d3daa05ac5c62c3bf93d0b3a4d75ba99c35f2;p=oota-llvm.git diff --git a/lib/VMCore/ValueSymbolTable.cpp b/lib/VMCore/ValueSymbolTable.cpp index 358b5a23d0b..e31410c29cd 100644 --- a/lib/VMCore/ValueSymbolTable.cpp +++ b/lib/VMCore/ValueSymbolTable.cpp @@ -17,21 +17,16 @@ #include "llvm/ValueSymbolTable.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/Debug.h" -#include using namespace llvm; // Class destructor ValueSymbolTable::~ValueSymbolTable() { #ifndef NDEBUG // Only do this in -g mode... - bool LeftoverValues = true; for (iterator VI = vmap.begin(), VE = vmap.end(); VI != VE; ++VI) - if (!isa(VI->second) ) { - DEBUG(DOUT << "Value still in symbol table! Type = '" - << VI->second->getType()->getDescription() << "' Name = '" - << VI->first << "'\n"); - LeftoverValues = false; - } - assert(LeftoverValues && "Values remain in symbol table!"); + DEBUG(DOUT << "Value still in symbol table! Type = '" + << VI->getValue()->getType()->getDescription() << "' Name = '" + << VI->getKeyData() << "'\n"); + assert(vmap.empty() && "Values remain in symbol table!"); #endif } @@ -41,11 +36,11 @@ ValueSymbolTable::~ValueSymbolTable() { // std::string ValueSymbolTable::getUniqueName(const std::string &BaseName) const { std::string TryName = BaseName; - const_iterator End = vmap.end(); // See if the name exists - while (vmap.find(TryName) != End) // Loop until we find a free - TryName = BaseName + utostr(++LastUnique); // name in the symbol table + while (vmap.find(&TryName[0], &TryName[TryName.size()]) != vmap.end()) + // Loop until we find a free name in the symbol table. + TryName = BaseName + utostr(++LastUnique); return TryName; } @@ -53,117 +48,95 @@ std::string ValueSymbolTable::getUniqueName(const std::string &BaseName) const { // lookup a value - Returns null on failure... // Value *ValueSymbolTable::lookup(const std::string &Name) const { - const_iterator VI = vmap.find(Name); + const_iterator VI = vmap.find(&Name[0], &Name[Name.size()]); if (VI != vmap.end()) // We found the symbol - return const_cast(VI->second); + return VI->getValue(); return 0; } -// Strip the symbol table of its names. -// -bool ValueSymbolTable::strip() { - bool RemovedSymbol = false; - for (iterator VI = vmap.begin(), VE = vmap.end(); VI != VE; ) { - Value *V = VI->second; - ++VI; - if (!isa(V) || cast(V)->hasInternalLinkage()) { - // Set name to "", removing from symbol table! - V->setName(""); - RemovedSymbol = true; - } - } - return RemovedSymbol; -} - // Insert a value into the symbol table with the specified name... // -void ValueSymbolTable::insert(Value* V) { - assert(V && "Can't insert null Value into symbol table!"); +void ValueSymbolTable::reinsertValue(Value* V) { assert(V->hasName() && "Can't insert nameless Value into symbol table"); // Try inserting the name, assuming it won't conflict. - if (vmap.insert(make_pair(V->Name, V)).second) { + if (vmap.insert(V->Name)) { DOUT << " Inserted value: " << V->Name << ": " << *V << "\n"; return; } + // FIXME: this could be much more efficient. + // Otherwise, there is a naming conflict. Rename this value. std::string UniqueName = V->getName(); + + V->Name->Destroy(); + unsigned BaseSize = UniqueName.size(); - do { + while (1) { // Trim any suffix off. UniqueName.resize(BaseSize); UniqueName += utostr(++LastUnique); - } while (!vmap.insert(make_pair(UniqueName, V)).second); - - DEBUG(DOUT << " Inserting value: " << UniqueName << ": " << *V << "\n"); - - // Insert the vmap entry - V->Name = UniqueName; + // Try insert the vmap entry with this suffix. + ValueName &NewName = vmap.GetOrCreateValue(&UniqueName[0], + &UniqueName[UniqueName.size()]); + if (NewName.getValue() == 0) { + // Newly inserted name. Success! + NewName.setValue(V); + V->Name = &NewName; + DEBUG(DOUT << " Inserted value: " << UniqueName << ": " << *V << "\n"); + return; + } + } } -// Remove a value -bool ValueSymbolTable::remove(Value *V) { - assert(V->hasName() && "Value doesn't have name!"); - iterator Entry = vmap.find(V->getName()); - if (Entry == vmap.end()) - return false; - - DEBUG(DOUT << " Removing Value: " << Entry->second->getName() << "\n"); - - // Remove the value from the plane... - vmap.erase(Entry); - return true; +void ValueSymbolTable::removeValueName(ValueName *V) { + DEBUG(DOUT << " Removing Value: " << V->getKeyData() << "\n"); + // Remove the value from the plane. + vmap.remove(V); } - -// rename - Given a value with a non-empty name, remove its existing entry -// from the symbol table and insert a new one for Name. This is equivalent to -// doing "remove(V), V->Name = Name, insert(V)", -// -bool ValueSymbolTable::rename(Value *V, const std::string &name) { - assert(V && "Can't rename a null Value"); - assert(V->hasName() && "Can't rename a nameless Value"); - assert(!V->getName().empty() && "Can't rename an Value with null name"); - assert(V->getName() != name && "Can't rename a Value with same name"); - assert(!name.empty() && "Can't rename a named Value with a null name"); - - // Find the name - iterator VI = vmap.find(V->getName()); - - // If we didn't find it, we're done - if (VI == vmap.end()) - return false; - - // Remove the old entry. - vmap.erase(VI); - - // See if we can insert the new name. - VI = vmap.lower_bound(name); - - // Is there a naming conflict? - if (VI != vmap.end() && VI->first == name) { - V->Name = getUniqueName( name); - vmap.insert(make_pair(V->Name, V)); - } else { - V->Name = name; - vmap.insert(VI, make_pair(V->Name, V)); +/// createValueName - This method attempts to create a value name and insert +/// it into the symbol table with the specified name. If it conflicts, it +/// auto-renames the name and returns that instead. +ValueName *ValueSymbolTable::createValueName(const char *NameStart, + unsigned NameLen, Value *V) { + ValueName &Entry = vmap.GetOrCreateValue(NameStart, NameStart+NameLen); + if (Entry.getValue() == 0) { + Entry.setValue(V); + DEBUG(DOUT << " Inserted value: " << Entry.getKeyData() << ": " + << *V << "\n"); + return &Entry; + } + + // FIXME: this could be much more efficient. + + // Otherwise, there is a naming conflict. Rename this value. + std::string UniqueName(NameStart, NameStart+NameLen); + while (1) { + // Trim any suffix off. + UniqueName.resize(NameLen); + UniqueName += utostr(++LastUnique); + // Try insert the vmap entry with this suffix. + ValueName &NewName = vmap.GetOrCreateValue(&UniqueName[0], + &UniqueName[UniqueName.size()]); + if (NewName.getValue() == 0) { + // Newly inserted name. Success! + NewName.setValue(V); + DEBUG(DOUT << " Inserted value: " << UniqueName << ": " << *V << "\n"); + return &NewName; + } } - - return true; } -// DumpVal - a std::for_each function for dumping a value -// -static void DumpVal(const std::pair &V) { - DOUT << " '" << V.first << "' = "; - V.second->dump(); - DOUT << "\n"; -} // dump - print out the symbol table // void ValueSymbolTable::dump() const { DOUT << "ValueSymbolTable:\n"; - for_each(vmap.begin(), vmap.end(), DumpVal); + for (const_iterator I = begin(), E = end(); I != E; ++I) { + DOUT << " '" << I->getKeyData() << "' = "; + I->getValue()->dump(); + DOUT << "\n"; + } }