X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FVMCore%2FValueSymbolTable.cpp;h=254bf06439d9b2b36f00a5e61583fe7d921f4af5;hb=6c3541d5597033bdb2f26f5ade811b482c32a39a;hp=2f55e490df68fe9ec872773446c8cdc0a49e57db;hpb=92f5b6a78407c84e5eb18907879b16de0f33f980;p=oota-llvm.git diff --git a/lib/VMCore/ValueSymbolTable.cpp b/lib/VMCore/ValueSymbolTable.cpp index 2f55e490df6..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. // //===----------------------------------------------------------------------===// // @@ -15,96 +15,103 @@ #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; // Class destructor ValueSymbolTable::~ValueSymbolTable() { #ifndef NDEBUG // Only do this in -g mode... for (iterator VI = vmap.begin(), VE = vmap.end(); VI != VE; ++VI) - DEBUG(DOUT << "Value still in symbol table! Type = '" - << VI->second->getType()->getDescription() << "' Name = '" - << VI->first << "'\n"); + 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; -} - // 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) { - DOUT << " Inserted value: " << V->Name << ": " << *V << "\n"; + if (vmap.insert(V->Name)) { + //DEBUG(dbgs() << " Inserted value: " << V->Name << ": " << *V << "\n"); return; } // Otherwise, there is a naming conflict. Rename this value. - std::string UniqueName = V->getName(); + 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(); - do { - // Trim any suffix off. + while (1) { + // Trim any suffix off and append the next number. UniqueName.resize(BaseSize); - UniqueName += utostr(++LastUnique); - // Try insert the vmap entry with this suffix. - } while (!vmap.insert(make_pair(UniqueName, V)).second); + raw_svector_ostream(UniqueName) << ++LastUnique; - V->Name = UniqueName; - - DEBUG(DOUT << " Inserted value: " << UniqueName << ": " << *V << "\n"); + // 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 -void ValueSymbolTable::remove(Value *V) { - assert(V->hasName() && "Value doesn't have name!"); - iterator Entry = vmap.find(V->getName()); - assert(Entry != vmap.end() && "Entry was not in the symtab!"); - - DEBUG(DOUT << " Removing Value: " << Entry->second->getName() << "\n"); - - // Remove the value from the plane... - vmap.erase(Entry); +void ValueSymbolTable::removeValueName(ValueName *V) { + //DEBUG(dbgs() << " Removing Value: " << V->getKeyData() << "\n"); + // Remove the value from the symbol table. + vmap.remove(V); } -// 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"; +/// 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; + } + } } + // 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"); + } }