X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FVMCore%2FValueSymbolTable.cpp;h=254bf06439d9b2b36f00a5e61583fe7d921f4af5;hb=6c3541d5597033bdb2f26f5ade811b482c32a39a;hp=6efb9983874ef087f91f5ae2dc262bd36968556c;hpb=2e3def1177c462e14b20ddad71adf5c6b7c3e867;p=oota-llvm.git diff --git a/lib/VMCore/ValueSymbolTable.cpp b/lib/VMCore/ValueSymbolTable.cpp index 6efb9983874..254bf06439d 100644 --- a/lib/VMCore/ValueSymbolTable.cpp +++ b/lib/VMCore/ValueSymbolTable.cpp @@ -2,8 +2,8 @@ // // The LLVM Compiler Infrastructure // -// This file was developed by the LLVM research group. It is distributed under -// the University of Illinois Open Source License. See LICENSE.TXT for details. +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. // //===----------------------------------------------------------------------===// // @@ -11,155 +11,107 @@ // //===----------------------------------------------------------------------===// +#define DEBUG_TYPE "valuesymtab" #include "llvm/GlobalValue.h" #include "llvm/Type.h" #include "llvm/ValueSymbolTable.h" -#include "llvm/ADT/StringExtras.h" +#include "llvm/ADT/SmallString.h" #include "llvm/Support/Debug.h" -#include +#include "llvm/Support/raw_ostream.h" using namespace llvm; -#define DEBUG_SYMBOL_TABLE 0 -#define DEBUG_ABSTYPE 0 - // 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) ) { - DOUT << "Value still in symbol table! Type = '" - << VI->second->getType()->getDescription() << "' Name = '" - << VI->first << "'\n"; - LeftoverValues = false; - } - assert(LeftoverValues && "Values remain in symbol table!"); + dbgs() << "Value still in symbol table! Type = '" + << VI->getValue()->getType()->getDescription() << "' Name = '" + << VI->getKeyData() << "'\n"; + assert(vmap.empty() && "Values remain in symbol table!"); #endif } -// getUniqueName - Given a base name, return a string that is either equal to -// it (or derived from it) that does not already occur in the symbol table for -// the specified type. -// -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 - return TryName; -} - - -// lookup a value - Returns null on failure... -// -Value *ValueSymbolTable::lookup(const std::string &Name) const { - const_iterator VI = vmap.find(Name); - if (VI != vmap.end()) // We found the symbol - return const_cast(VI->second); - 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"); - // Check to see if there is a naming conflict. If so, rename this type! - std::string UniqueName = getUniqueName(V->getName()); - -#if DEBUG_SYMBOL_TABLE - dump(); - DOUT << " Inserting value: " << UniqueName << ": " << V->dump() << "\n"; -#endif - - // Insert the vmap entry - vmap.insert(make_pair(UniqueName, V)); + // Try inserting the name, assuming it won't conflict. + if (vmap.insert(V->Name)) { + //DEBUG(dbgs() << " Inserted value: " << V->Name << ": " << *V << "\n"); + return; + } + + // Otherwise, there is a naming conflict. Rename this value. + SmallString<256> UniqueName(V->getName().begin(), V->getName().end()); + + // The name is too already used, just free it so we can allocate a new name. + V->Name->Destroy(); + + unsigned BaseSize = UniqueName.size(); + while (1) { + // Trim any suffix off and append the next number. + UniqueName.resize(BaseSize); + raw_svector_ostream(UniqueName) << ++LastUnique; + + // Try insert the vmap entry with this suffix. + ValueName &NewName = vmap.GetOrCreateValue(UniqueName); + if (NewName.getValue() == 0) { + // Newly inserted name. Success! + NewName.setValue(V); + V->Name = &NewName; + //DEBUG(dbgs() << " Inserted value: " << UniqueName << ": " << *V << "\n"); + return; + } + } } -// Remove a value -bool ValueSymbolTable::erase(Value *V) { - assert(V->hasName() && "Value doesn't have name!"); - iterator Entry = vmap.find(V->getName()); - if (Entry == vmap.end()) - return false; - -#if DEBUG_SYMBOL_TABLE - dump(); - DOUT << " Removing Value: " << Entry->second->getName() << "\n"; -#endif - - // Remove the value from the plane... - vmap.erase(Entry); - return true; +void ValueSymbolTable::removeValueName(ValueName *V) { + //DEBUG(dbgs() << " Removing Value: " << V->getKeyData() << "\n"); + // Remove the value from the symbol table. + 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(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(StringRef Name, Value *V) { + // In the common case, the name is not already in the symbol table. + ValueName &Entry = vmap.GetOrCreateValue(Name); + if (Entry.getValue() == 0) { + Entry.setValue(V); + //DEBUG(dbgs() << " Inserted value: " << Entry.getKeyData() << ": " + // << *V << "\n"); + return &Entry; + } + + // Otherwise, there is a naming conflict. Rename this value. + SmallString<256> UniqueName(Name.begin(), Name.end()); + + while (1) { + // Trim any suffix off and append the next number. + UniqueName.resize(Name.size()); + raw_svector_ostream(UniqueName) << ++LastUnique; + + // Try insert the vmap entry with this suffix. + ValueName &NewName = vmap.GetOrCreateValue(UniqueName); + if (NewName.getValue() == 0) { + // Newly inserted name. Success! + NewName.setValue(V); + //DEBUG(dbgs() << " 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); + //DEBUG(dbgs() << "ValueSymbolTable:\n"); + for (const_iterator I = begin(), E = end(); I != E; ++I) { + //DEBUG(dbgs() << " '" << I->getKeyData() << "' = "); + I->getValue()->dump(); + //DEBUG(dbgs() << "\n"); + } }