//
// 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.
//
//===----------------------------------------------------------------------===//
//
#include "llvm/ValueSymbolTable.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/Support/Debug.h"
-#include <algorithm>
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<Constant>(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!");
+ cerr << "Value still in symbol table! Type = '"
+ << VI->getValue()->getType()->getDescription() << "' Name = '"
+ << VI->getKeyData() << "'\n";
+ assert(vmap.empty() && "Values remain in symbol table!");
#endif
}
//
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;
}
// 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<Value*>(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<GlobalValue>(V) || cast<GlobalValue>(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) {
- DOUT << " Inserted value: " << V->Name << ": " << *V << "\n";
+ 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
-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(DOUT << " Removing Value: " << V->getKeyData() << "\n");
+ // Remove the value from the plane.
+ vmap.remove(V);
}
-// DumpVal - a std::for_each function for dumping a value
-//
-static void DumpVal(const std::pair<const std::string, Value *> &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(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;
+ }
+ }
}
+
// dump - print out the symbol table
//
void ValueSymbolTable::dump() const {
- DOUT << "ValueSymbolTable:\n";
- for_each(vmap.begin(), vmap.end(), DumpVal);
+ //DOUT << "ValueSymbolTable:\n";
+ for (const_iterator I = begin(), E = end(); I != E; ++I) {
+ //DOUT << " '" << I->getKeyData() << "' = ";
+ I->getValue()->dump();
+ //DOUT << "\n";
+ }
}
projects / oota-llvm.git / blobdiff