[llvm-commits] [bug_122] CVS: llvm/lib/VMCore/SymbolTable.cpp
LLVM
llvm at cs.uiuc.edu
Sun May 16 18:43:00 PDT 2004
Changes in directory llvm/lib/VMCore:
SymbolTable.cpp updated: 1.42.6.1 -> 1.42.6.2
---
Log message:
Implement new functions to deal with Types separately since Types are not
Values now. Also make consistent the names of the various iterators. PI is
used for plane_iterator, VI for value_iterator, and TI for type_iterator.
---
Diffs of the changes: (+187 -121)
Index: llvm/lib/VMCore/SymbolTable.cpp
diff -u llvm/lib/VMCore/SymbolTable.cpp:1.42.6.1 llvm/lib/VMCore/SymbolTable.cpp:1.42.6.2
--- llvm/lib/VMCore/SymbolTable.cpp:1.42.6.1 Wed May 12 11:33:43 2004
+++ llvm/lib/VMCore/SymbolTable.cpp Sun May 16 18:43:51 2004
@@ -23,14 +23,9 @@
SymbolTable::~SymbolTable() {
// Drop all abstract type references in the type plane...
- type_iterator TyPlane = map.find(Type::TypeTy);
- if (TyPlane != map.end()) {
- ValueMap &TyP = TyPlane->second;
- for (value_iterator I = TyP.begin(), E = TyP.end(); I != E; ++I) {
- const Type *Ty = cast<Type>(I->second);
- if (Ty->isAbstract()) // If abstract, drop the reference...
- cast<DerivedType>(Ty)->removeAbstractTypeUser(this);
- }
+ for (type_iterator TI = tmap.begin(), TE = tmap.end(); TI != TE; ++TI) {
+ if (TI->second->isAbstract()) // If abstract, drop the reference...
+ cast<DerivedType>(TI->second)->removeAbstractTypeUser(this);
}
// TODO: FIXME: BIG ONE: This doesn't unreference abstract types for the planes
@@ -38,12 +33,12 @@
#ifndef NDEBUG // Only do this in -g mode...
bool LeftoverValues = true;
- for (type_iterator i = map.begin(); i != map.end(); ++i) {
- for (value_iterator I = i->second.begin(); I != i->second.end(); ++I)
- if (!isa<Constant>(I->second) && !isa<Type>(I->second)) {
+ for (plane_iterator PI = pmap.begin(); PI != pmap.end(); ++PI) {
+ for (value_iterator VI = PI->second.begin(); VI != PI->second.end(); ++VI)
+ if (!isa<Constant>(VI->second) ) {
std::cerr << "Value still in symbol table! Type = '"
- << i->first->getDescription() << "' Name = '"
- << I->first << "'\n";
+ << PI->first->getDescription() << "' Name = '"
+ << VI->first << "'\n";
LeftoverValues = false;
}
}
@@ -58,46 +53,55 @@
//
std::string SymbolTable::getUniqueName(const Type *Ty,
const std::string &BaseName) const {
- type_const_iterator I = map.find(Ty);
- if (I == map.end()) return BaseName;
+ plane_const_iterator PI = pmap.find(Ty);
+ if (PI == pmap.end()) return BaseName;
std::string TryName = BaseName;
- value_const_iterator End = I->second.end();
+ const ValueMap& vmap = PI->second;
+ value_const_iterator End = vmap.end();
- while (I->second.find(TryName) != End) // Loop until we find a free
+ while (vmap.find(TryName) != End) // Loop until we find a free
TryName = BaseName + utostr(++LastUnique); // name in the symbol table
return TryName;
}
-
-// lookup - Returns null on failure...
+// lookup a value - Returns null on failure...
Value *SymbolTable::lookup(const Type *Ty, const std::string &Name) const {
- type_const_iterator I = map.find(Ty);
- if (I != map.end()) { // We have symbols in that plane...
- value_const_iterator J = I->second.find(Name);
- if (J != I->second.end()) // and the name is in our hash table...
- return J->second;
+ plane_const_iterator PI = pmap.find(Ty);
+ if (PI != pmap.end()) { // We have symbols in that plane...
+ value_const_iterator VI = PI->second.find(Name);
+ if (VI != PI->second.end()) // and the name is in our hash table...
+ return VI->second;
}
+ return 0;
+}
+
+// lookup a type by name - returns null on failure
+Type* SymbolTable::lookupType( const std::string& Name ) const {
+ type_const_iterator TI = tmap.find( Name );
+ if ( TI != tmap.end() )
+ return TI->second;
return 0;
}
+// Remove a value
void SymbolTable::remove(Value *N) {
assert(N->hasName() && "Value doesn't have name!");
if (InternallyInconsistent) return;
- type_iterator I = map.find(N->getType());
- assert(I != map.end() &&
- "Trying to remove a type that doesn't have a plane yet!");
- removeEntry(I, I->second.find(N->getName()));
+ plane_iterator PI = pmap.find(N->getType());
+ assert(PI != pmap.end() &&
+ "Trying to remove a value that doesn't have a type plane yet!");
+ removeEntry(PI, PI->second.find(N->getName()));
}
+
// removeEntry - Remove a value from the symbol table...
-//
-Value *SymbolTable::removeEntry(type_iterator Plane, value_iterator Entry) {
+Value *SymbolTable::removeEntry(plane_iterator Plane, value_iterator Entry) {
if (InternallyInconsistent) return 0;
- assert(Plane != map.end() &&
+ assert(Plane != pmap.end() &&
Entry != Plane->second.end() && "Invalid entry to remove!");
Value *Result = Entry->second;
@@ -123,34 +127,60 @@
cast<DerivedType>(Plane->first)->removeAbstractTypeUser(this);
}
- map.erase(Plane);
+ pmap.erase(Plane);
}
+ return Result;
+}
+
+
+// remove - Remove a type
+void SymbolTable::remove(Type* Ty ) {
+ type_iterator TI = this->type_begin();
+ type_iterator TE = this->type_end();
+
+ // Search for the entry
+ while ( TI != TE && TI->second != Ty )
+ ++TI;
+
+ if ( TI != TE )
+ this->removeEntry( TI );
+}
+
+
+// removeEntry - Remove a type from the symbol table...
+Type* SymbolTable::removeEntry(type_iterator Entry) {
+ if (InternallyInconsistent) return 0;
+ assert( Entry != tmap.end() && "Invalid entry to remove!");
+
+ Type* Result = Entry->second;
+
+#if DEBUG_SYMBOL_TABLE
+ dump();
+ std::cerr << " Removing Value: " << Result->getName() << "\n";
+#endif
+
+ tmap.erase(Entry);
// If we are removing an abstract type, remove the symbol table from it's use
// list...
- if (Ty == Type::TypeTy) {
- const Type *T = cast<Type>(Result);
- if (T->isAbstract()) {
+ if (Result->isAbstract()) {
#if DEBUG_ABSTYPE
- std::cerr << "Removing abs type from symtab" << T->getDescription()<<"\n";
+ std::cerr << "Removing abstract type from symtab" << Result->getDescription()<<"\n";
#endif
- cast<DerivedType>(T)->removeAbstractTypeUser(this);
- }
+ cast<DerivedType>(Result)->removeAbstractTypeUser(this);
}
return Result;
}
-// insertEntry - Insert a value into the symbol table with the specified
-// name...
-//
+
+// insertEntry - Insert a value into the symbol table with the specified name.
void SymbolTable::insertEntry(const std::string &Name, const Type *VTy,
Value *V) {
-
// Check to see if there is a naming conflict. If so, rename this value!
if (lookup(VTy, Name)) {
std::string UniqueName = getUniqueName(VTy, Name);
- assert(InternallyInconsistent == false && "Infinite loop inserting entry!");
+ assert(InternallyInconsistent == false && "Infinite loop inserting value!");
InternallyInconsistent = true;
V->setName(UniqueName, this);
InternallyInconsistent = false;
@@ -163,11 +193,11 @@
<< VTy->getDescription() << "\n";
#endif
- type_iterator I = map.find(VTy);
- if (I == map.end()) { // Not in collection yet... insert dummy entry
+ plane_iterator PI = pmap.find(VTy);
+ if (PI == pmap.end()) { // Not in collection yet... insert dummy entry
// Insert a new empty element. I points to the new elements.
- I = map.insert(make_pair(VTy, ValueMap())).first;
- assert(I != map.end() && "How did insert fail?");
+ PI = pmap.insert(make_pair(VTy, ValueMap())).first;
+ assert(PI != pmap.end() && "How did insert fail?");
// Check to see if the type is abstract. If so, it might be refined in the
// future, which would cause the plane of the old type to get merged into
@@ -182,85 +212,120 @@
}
}
- I->second.insert(make_pair(Name, V));
+ PI->second.insert(make_pair(Name, V));
+}
+
+
+// insertEntry - Insert a value into the symbol table with the specified
+// name...
+//
+void SymbolTable::insertEntry(const std::string& Name, Type* T) {
+
+ // Check to see if there is a naming conflict. If so, rename this type!
+ std::string UniqueName = Name;
+ if (lookupType(Name))
+ UniqueName = getUniqueName(T, Name);
+
+#if DEBUG_SYMBOL_TABLE
+ dump();
+ std::cerr << " Inserting type: " << UniqueName << ": "
+ << T->getDescription() << "\n";
+#endif
+
+ // Insert the tmap entry
+ tmap.insert(make_pair(UniqueName, T));
// If we are adding an abstract type, add the symbol table to it's use list.
- if (VTy == Type::TypeTy) {
- const Type *T = cast<Type>(V);
- if (T->isAbstract()) {
- cast<DerivedType>(T)->addAbstractTypeUser(this);
+ if (T->isAbstract()) {
+ cast<DerivedType>(T)->addAbstractTypeUser(this);
#if DEBUG_ABSTYPE
- std::cerr << "Added abstract type to ST: " << T->getDescription() << "\n";
+ std::cerr << "Added abstract type to ST: " << T->getDescription() << "\n";
#endif
- }
}
}
-bool
-SymbolTable::hasTypes( void ) const {
- type_const_iterator PI = map.find(Type::TypeTy);
- if (PI == map.end()) return false;
- return true;
-}
-bool
-SymbolTable::isEmpty( void ) const {
- return map.empty();
+// Determine how many entries for a given type.
+unsigned SymbolTable::type_size(const Type *Ty) const {
+ plane_const_iterator PI = pmap.find(Ty);
+ if ( PI == pmap.end() ) return 0;
+ return PI->second.size();
}
-std::string SymbolTable::get_name( const Value* v ) const {
- if (map.find(Type::TypeTy) == map.end())
- return ""; // No names for types...
- value_const_iterator VI = type_begin(Type::TypeTy);
- value_const_iterator VE = type_end(Type::TypeTy);
+// Get the name of a value
+std::string SymbolTable::get_name( const Value* V ) const {
+ value_const_iterator VI = this->value_begin( V->getType() );
+ value_const_iterator VE = this->value_end( V->getType() );
- while (VI != VE && VI->second != v )
+ // Search for the entry
+ while ( VI != VE && VI->second != V )
++VI;
- if (VI != VE) // Must have found an entry!
+ if ( VI != VE )
return VI->first;
+
+ return "";
+}
+
+
+// Get the name of a type
+std::string SymbolTable::get_name( const Type* T ) const {
+ if (tmap.empty()) return ""; // No types at all.
+
+ type_const_iterator TI = tmap.begin();
+ type_const_iterator TE = tmap.end();
+
+ // Search for the entry
+ while (TI != TE && TI->second != T )
+ ++TI;
+
+ if (TI != TE) // Must have found an entry!
+ return TI->first;
return ""; // Must not have found anything...
}
+
+// Strip the symbol table of its names.
bool SymbolTable::strip( void ) {
bool RemovedSymbol = false;
- for (type_iterator I = map.begin(); I != map.end();) {
+ for (plane_iterator I = pmap.begin(); I != pmap.end();) {
// Removing items from the plane can cause the plane itself to get deleted.
// If this happens, make sure we incremented our plane iterator already!
ValueMap &Plane = (I++)->second;
value_iterator B = Plane.begin(), Bend = Plane.end();
while (B != Bend) { // Found nonempty type plane!
Value *V = B->second;
-
- if (isa<Constant>(V) || isa<Type>(V)) {
- type_remove(B++);
+ if (isa<Constant>(V)) {
+ remove(V);
RemovedSymbol = true;
} else {
- ++B;
if (!isa<GlobalValue>(V) || cast<GlobalValue>(V)->hasInternalLinkage()){
// Set name to "", removing from symbol table!
V->setName("", this);
RemovedSymbol = true;
}
}
+ ++B;
}
}
return RemovedSymbol;
}
+
// This function is called when one of the types in the type plane are refined
void SymbolTable::refineAbstractType(const DerivedType *OldType,
const Type *NewType) {
- // Search to see if we have any values of the type oldtype. If so, we need to
+
+ // Search to see if we have any values of the type Oldtype. If so, we need to
// move them into the newtype plane...
- type_iterator TPI = map.find(OldType);
- if (TPI != map.end()) {
+ plane_iterator PI = pmap.find(OldType);
+ if (PI != pmap.end()) {
// Get a handle to the new type plane...
- type_iterator NewTypeIt = map.find(NewType);
- if (NewTypeIt == map.end()) { // If no plane exists, add one
- NewTypeIt = map.insert(make_pair(NewType, ValueMap())).first;
+ plane_iterator NewTypeIt = pmap.find(NewType);
+ if (NewTypeIt == pmap.end()) { // If no plane exists, add one
+ NewTypeIt = pmap.insert(make_pair(NewType, ValueMap())).first;
if (NewType->isAbstract()) {
cast<DerivedType>(NewType)->addAbstractTypeUser(this);
@@ -272,21 +337,21 @@
}
ValueMap &NewPlane = NewTypeIt->second;
- ValueMap &OldPlane = TPI->second;
+ ValueMap &OldPlane = PI->second;
while (!OldPlane.empty()) {
std::pair<const std::string, Value*> V = *OldPlane.begin();
// Check to see if there is already a value in the symbol table that this
// would collide with.
- value_iterator TI = NewPlane.find(V.first);
- if (TI != NewPlane.end() && TI->second == V.second) {
+ value_iterator VI = NewPlane.find(V.first);
+ if (VI != NewPlane.end() && VI->second == V.second) {
// No action
- } else if (TI != NewPlane.end()) {
+ } else if (VI != NewPlane.end()) {
// The only thing we are allowing for now is two external global values
// folded into one.
//
- GlobalValue *ExistGV = dyn_cast<GlobalValue>(TI->second);
+ GlobalValue *ExistGV = dyn_cast<GlobalValue>(VI->second);
GlobalValue *NewGV = dyn_cast<GlobalValue>(V.second);
if (ExistGV && NewGV) {
@@ -348,54 +413,48 @@
OldType->removeAbstractTypeUser(this);
// Remove the plane that is no longer used
- map.erase(TPI);
+ pmap.erase(PI);
}
- TPI = map.find(Type::TypeTy);
- if (TPI != map.end()) {
- // Loop over all of the types in the symbol table, replacing any references
- // to OldType with references to NewType. Note that there may be multiple
- // occurrences, and although we only need to remove one at a time, it's
- // faster to remove them all in one pass.
- //
- ValueMap &TyPlane = TPI->second;
- for (value_iterator I = TyPlane.begin(), E = TyPlane.end(); I != E; ++I)
- if (I->second == (Value*)OldType) { // FIXME when Types aren't const.
+ // Loop over all of the types in the symbol table, replacing any references
+ // to OldType with references to NewType. Note that there may be multiple
+ // occurrences, and although we only need to remove one at a time, it's
+ // faster to remove them all in one pass.
+ //
+ for (type_iterator I = type_begin(), E = type_end(); I != E; ++I) {
+ if (I->second == (Type*)OldType) { // FIXME when Types aren't const.
#if DEBUG_ABSTYPE
- std::cerr << "Removing type " << OldType->getDescription() << "\n";
+ std::cerr << "Removing type " << OldType->getDescription() << "\n";
#endif
- OldType->removeAbstractTypeUser(this);
+ OldType->removeAbstractTypeUser(this);
- I->second = (Value*)NewType; // TODO FIXME when types aren't const
- if (NewType->isAbstract()) {
+ I->second = (Type*)NewType; // TODO FIXME when types aren't const
+ if (NewType->isAbstract()) {
#if DEBUG_ABSTYPE
- std::cerr << "Added type " << NewType->getDescription() << "\n";
+ std::cerr << "Added type " << NewType->getDescription() << "\n";
#endif
- cast<DerivedType>(NewType)->addAbstractTypeUser(this);
- }
+ cast<DerivedType>(NewType)->addAbstractTypeUser(this);
}
+ }
}
}
+
+// Handle situation where type becomes Concreate from Abstract
void SymbolTable::typeBecameConcrete(const DerivedType *AbsTy) {
- type_iterator TPI = map.find(AbsTy);
+ plane_iterator PI = pmap.find(AbsTy);
// If there are any values in the symbol table of this type, then the type
- // plan is a use of the abstract type which must be dropped.
- if (TPI != map.end())
+ // plane is a use of the abstract type which must be dropped.
+ if (PI != pmap.end())
AbsTy->removeAbstractTypeUser(this);
- TPI = map.find(Type::TypeTy);
- if (TPI != map.end()) {
- // Loop over all of the types in the symbol table, dropping any abstract
- // type user entries for AbsTy which occur because there are names for the
- // type.
- //
- ValueMap &TyPlane = TPI->second;
- for (value_iterator I = TyPlane.begin(), E = TyPlane.end(); I != E; ++I)
- if (I->second == (Value*)AbsTy) // FIXME when Types aren't const.
- AbsTy->removeAbstractTypeUser(this);
- }
+ // Loop over all of the types in the symbol table, dropping any abstract
+ // type user entries for AbsTy which occur because there are names for the
+ // type.
+ for (type_iterator TI = type_begin(), TE = type_end(); TI != TE; ++TI)
+ if (TI->second == (Type*)AbsTy) // FIXME when Types aren't const.
+ AbsTy->removeAbstractTypeUser(this);
}
static void DumpVal(const std::pair<const std::string, Value *> &V) {
@@ -406,15 +465,22 @@
static void DumpPlane(const std::pair<const Type *,
std::map<const std::string, Value *> >&P){
- std::cout << " Plane: ";
P.first->dump();
std::cout << "\n";
for_each(P.second.begin(), P.second.end(), DumpVal);
}
+static void DumpTypes(const std::pair<const std::string, Type*>& T ) {
+ std::cout << " '" << T.first << "' = ";
+ T.second->dump();
+ std::cout << "\n";
+}
+
void SymbolTable::dump() const {
- std::cout << "Symbol table dump:\n";
- for_each(map.begin(), map.end(), DumpPlane);
+ std::cout << "Symbol table dump:\n Plane:";
+ for_each(pmap.begin(), pmap.end(), DumpPlane);
+ std::cout << " Types: ";
+ for_each(tmap.begin(), tmap.end(), DumpTypes);
}
// vim: sw=2 ai
More information about the llvm-commits
mailing list