#include "llvm/SymbolTable.h"
#include "llvm/InstrTypes.h"
-#include "llvm/Support/StringExtras.h"
#include "llvm/DerivedTypes.h"
-#include "llvm/Method.h"
+#include "llvm/Module.h"
+#include "llvm/Function.h"
+#include "Support/StringExtras.h"
+#include <iostream>
+
+using std::string;
+using std::pair;
+using std::make_pair;
+using std::map;
+using std::cerr;
+using std::cout;
#define DEBUG_SYMBOL_TABLE 0
#define DEBUG_ABSTYPE 0
cast<DerivedType>(Ty)->removeAbstractTypeUser(this);
}
}
+
+ // TODO: FIXME: BIG ONE: This doesn't unreference abstract types for the planes
+ // that could still have entries!
+
#ifndef NDEBUG // Only do this in -g mode...
bool LeftoverValues = true;
for (iterator i = begin(); i != end(); ++i) {
for (type_iterator I = i->second.begin(); I != i->second.end(); ++I)
- if (!isa<ConstPoolVal>(I->second) && !isa<Type>(I->second)) {
+ if (!isa<Constant>(I->second) && !isa<Type>(I->second)) {
cerr << "Value still in symbol table! Type = '"
- << i->first->getDescription() << "' Name = '" << I->first << "'\n";
+ << i->first->getDescription() << "' Name = '"
+ << I->first << "'\n";
LeftoverValues = false;
}
}
// lookup - Returns null on failure...
-Value *SymbolTable::lookup(const Type *Ty, const string &Name) {
+Value *SymbolTable::localLookup(const Type *Ty, const string &Name) {
iterator I = find(Ty);
if (I != end()) { // We have symbols in that plane...
type_iterator J = I->second.find(Name);
return J->second;
}
+ return 0;
+}
+
+// lookup - Returns null on failure...
+Value *SymbolTable::lookup(const Type *Ty, const string &Name) {
+ Value *LV = localLookup(Ty, Name);
+ if (LV) return LV;
return ParentSymTab ? ParentSymTab->lookup(Ty, Name) : 0;
}
void SymbolTable::remove(Value *N) {
assert(N->hasName() && "Value doesn't have name!");
+ if (InternallyInconsistent) return;
iterator I = find(N->getType());
+ assert(I != end() &&
+ "Trying to remove a type that doesn't have a plane yet!");
removeEntry(I, I->second.find(N->getName()));
}
// removeEntry - Remove a value from the symbol table...
//
Value *SymbolTable::removeEntry(iterator Plane, type_iterator Entry) {
+ if (InternallyInconsistent) return 0;
assert(Plane != super::end() &&
Entry != Plane->second.end() && "Invalid entry to remove!");
// name...
//
void SymbolTable::insertEntry(const string &Name, const Type *VTy, Value *V) {
- // TODO: The typeverifier should catch this when its implemented
- assert(lookup(VTy, Name) == 0 &&
- "SymbolTable::insertEntry - Name already in symbol table!");
+
+ // Check to see if there is a naming conflict. If so, rename this value!
+ if (localLookup(VTy, Name)) {
+ string UniqueName = getUniqueName(VTy, Name);
+ assert(InternallyInconsistent == false && "Infinite loop inserting entry!");
+ InternallyInconsistent = true;
+ V->setName(UniqueName, this);
+ InternallyInconsistent = false;
+ return;
+ }
#if DEBUG_SYMBOL_TABLE
cerr << this << " Inserting definition: " << Name << ": "
// This function is called when one of the types in the type plane are refined
void SymbolTable::refineAbstractType(const DerivedType *OldType,
const Type *NewType) {
- if (OldType == NewType) return; // Noop, don't waste time dinking around
+ if (OldType == NewType && OldType->isAbstract())
+ return; // Noop, don't waste time dinking around
- // Get a handle to the new type plane...
- iterator NewTypeIt = find(NewType);
- if (NewTypeIt == super::end()) { // If no plane exists, add one
- NewTypeIt = super::insert(make_pair(NewType, VarMap())).first;
-
- if (NewType->isAbstract()) {
- cast<DerivedType>(NewType)->addAbstractTypeUser(this);
+ // Search to see if we have any values of the type oldtype. If so, we need to
+ // move them into the newtype plane...
+ iterator TPI = find(OldType);
+ if (OldType != NewType && TPI != end()) {
+ // Get a handle to the new type plane...
+ iterator NewTypeIt = find(NewType);
+ if (NewTypeIt == super::end()) { // If no plane exists, add one
+ NewTypeIt = super::insert(make_pair(NewType, VarMap())).first;
+
+ if (NewType->isAbstract()) {
+ cast<DerivedType>(NewType)->addAbstractTypeUser(this);
#if DEBUG_ABSTYPE
- cerr << "refined to abstype: " << NewType->getDescription() <<endl;
+ cerr << "[Added] refined to abstype: "<<NewType->getDescription()<<endl;
#endif
+ }
}
- }
- VarMap &NewPlane = NewTypeIt->second;
-
- // Search to see if we have any values of the type oldtype. If so, we need to
- // move them into the newtype plane...
- iterator TPI = find(OldType);
- if (TPI != end()) {
+ VarMap &NewPlane = NewTypeIt->second;
VarMap &OldPlane = TPI->second;
while (!OldPlane.empty()) {
pair<const string, Value*> V = *OldPlane.begin();
// The only thing we are allowing for now is two method prototypes being
// folded into one.
//
- if (Method *ExistM = dyn_cast<Method>(TI->second))
- if (Method *NewM = dyn_cast<Method>(V.second))
- if (ExistM->isExternal() && NewM->isExternal()) {
- // Ok we have two external methods. Make all uses of the new one
- // use the old one...
- //
- NewM->replaceAllUsesWith(ExistM);
-
- // Now we just convert it to an unnamed method... which won't get
- // added to our symbol table. The problem is that if we call
- // setName on the method that it will try to remove itself from
- // the symbol table and die... because it's not in the symtab
- // right now. To fix this, we temporarily insert it (by setting
- // TI's entry to the old value. Then after it is removed, we
- // restore ExistM into the symbol table.
- //
- if (NewM->getType() == NewType) {
- TI->second = NewM; // Add newM to the symtab
-
- // Remove newM from the symtab
- NewM->setName("");
-
- // Readd ExistM to the symbol table....
- NewPlane.insert(make_pair(V.first, ExistM));
- } else {
- NewM->setName("");
- }
- continue;
- }
- assert(0 && "Two ploanes folded together with overlapping "
- "value names!");
+ Function *ExistM = dyn_cast<Function>(TI->second);
+ Function *NewM = dyn_cast<Function>(V.second);
+
+ if (ExistM && NewM && ExistM->isExternal() && NewM->isExternal()) {
+ // Ok we have two external methods. Make all uses of the new one
+ // use the old one...
+ //
+ NewM->replaceAllUsesWith(ExistM);
+
+ // Now we just convert it to an unnamed method... which won't get
+ // added to our symbol table. The problem is that if we call
+ // setName on the method that it will try to remove itself from
+ // the symbol table and die... because it's not in the symtab
+ // right now. To fix this, we have an internally consistent flag
+ // that turns remove into a noop. Thus the name will get null'd
+ // out, but the symbol table won't get upset.
+ //
+ assert(InternallyInconsistent == false &&
+ "Symbol table already inconsistent!");
+ InternallyInconsistent = true;
+
+ // Remove newM from the symtab
+ NewM->setName("");
+ InternallyInconsistent = false;
+
+ // Now we can remove this method from the module entirely...
+ NewM->getParent()->getFunctionList().remove(NewM);
+ delete NewM;
+
+ } else {
+ assert(0 && "Two ploanes folded together with overlapping "
+ "value names!");
+ }
} else {
insertEntry(V.first, NewType, V.second);
// Remove the plane that is no longer used
erase(TPI);
+ } else if (TPI != end()) {
+ assert(OldType == NewType);
+#if DEBUG_ABSTYPE
+ cerr << "Removing SELF type " << OldType->getDescription() << endl;
+#endif
+ OldType->removeAbstractTypeUser(this);
}
TPI = find(Type::TypeTy);
- assert(TPI != end() &&"Type plane not in symbol table but we contain types!");
-
- // 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
- // occurances, and although we only need to remove one at a time, it's faster
- // to remove them all in one pass.
- //
- VarMap &TyPlane = TPI->second;
- for (VarMap::iterator I = TyPlane.begin(), E = TyPlane.end(); I != E; ++I)
- if (I->second == (Value*)OldType) { // FIXME when Types aren't const.
+ if (TPI != 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
+ // occurances, and although we only need to remove one at a time, it's faster
+ // to remove them all in one pass.
+ //
+ VarMap &TyPlane = TPI->second;
+ for (VarMap::iterator I = TyPlane.begin(), E = TyPlane.end(); I != E; ++I)
+ if (I->second == (Value*)OldType) { // FIXME when Types aren't const.
#if DEBUG_ABSTYPE
- cerr << "Removing type " << OldType->getDescription() << endl;
+ cerr << "Removing type " << OldType->getDescription() << endl;
#endif
- OldType->removeAbstractTypeUser(this);
-
- I->second = (Value*)NewType; // TODO FIXME when types aren't const
- if (NewType->isAbstract()) {
+ OldType->removeAbstractTypeUser(this);
+
+ I->second = (Value*)NewType; // TODO FIXME when types aren't const
+ if (NewType->isAbstract()) {
#if DEBUG_ABSTYPE
- cerr << "Added type " << NewType->getDescription() << endl;
+ cerr << "Added type " << NewType->getDescription() << endl;
#endif
- cast<const DerivedType>(NewType)->addAbstractTypeUser(this);
+ cast<const DerivedType>(NewType)->addAbstractTypeUser(this);
+ }
}
- }
+ }
}
#include <algorithm>
static void DumpVal(const pair<const string, Value *> &V) {
- cout << " '" << V.first << "' = " << V.second << endl;
+ cout << " '" << V.first << "' = " << V.second << "\n";
}
static void DumpPlane(const pair<const Type *, map<const string, Value *> >&P) {
- cout << " Plane: " << P.first << endl;
+ cout << " Plane: " << P.first << "\n";
for_each(P.second.begin(), P.second.end(), DumpVal);
}
projects / oota-llvm.git / blobdiff