//===----------------------------------------------------------------------===//
#include "llvm/SymbolTable.h"
-#include "llvm/InstrTypes.h"
#include "llvm/DerivedTypes.h"
#include "llvm/Module.h"
-#include "llvm/Method.h"
+#include "llvm/InstrTypes.h"
#include "Support/StringExtras.h"
#include <iostream>
+#include <algorithm>
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
return J->second;
}
- return ParentSymTab ? ParentSymTab->lookup(Ty, Name) : 0;
+ return 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()));
}
Value *Result = Entry->second;
const Type *Ty = Result->getType();
#if DEBUG_SYMBOL_TABLE
- cerr << this << " Removing Value: " << Result->getName() << endl;
+ dump();
+ std::cerr << " Removing Value: " << Result->getName() << "\n";
#endif
// Remove the value from the plane...
if (Plane->first->isAbstract()) {
#if DEBUG_ABSTYPE
cerr << "Plane Empty: Removing type: " << Plane->first->getDescription()
- << endl;
+ << "\n";
#endif
cast<DerivedType>(Plane->first)->removeAbstractTypeUser(this);
}
const Type *T = cast<const Type>(Result);
if (T->isAbstract()) {
#if DEBUG_ABSTYPE
- cerr << "Removing abs type from symtab" << T->getDescription() << endl;
+ cerr << "Removing abs type from symtab" << T->getDescription() << "\n";
#endif
cast<DerivedType>(T)->removeAbstractTypeUser(this);
}
// name...
//
void SymbolTable::insertEntry(const 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)) {
string UniqueName = getUniqueName(VTy, Name);
+ assert(InternallyInconsistent == false && "Infinite loop inserting entry!");
InternallyInconsistent = true;
V->setName(UniqueName, this);
InternallyInconsistent = false;
}
#if DEBUG_SYMBOL_TABLE
- cerr << this << " Inserting definition: " << Name << ": "
- << VTy->getDescription() << endl;
+ dump();
+ cerr << " Inserting definition: " << Name << ": "
+ << VTy->getDescription() << "\n";
#endif
iterator I = find(VTy);
if (VTy->isAbstract()) {
cast<DerivedType>(VTy)->addAbstractTypeUser(this);
#if DEBUG_ABSTYPE
- cerr << "Added abstract type value: " << VTy->getDescription() << endl;
+ cerr << "Added abstract type value: " << VTy->getDescription() << "\n";
#endif
}
}
if (T->isAbstract()) {
cast<DerivedType>(T)->addAbstractTypeUser(this);
#if DEBUG_ABSTYPE
- cerr << "Added abstract type to ST: " << T->getDescription() << endl;
+ cerr << "Added abstract type to ST: " << T->getDescription() << "\n";
#endif
}
}
if (NewType->isAbstract()) {
cast<DerivedType>(NewType)->addAbstractTypeUser(this);
#if DEBUG_ABSTYPE
- cerr << "[Added] refined to abstype: "<<NewType->getDescription()<<endl;
+ cerr << "[Added] refined to abstype: "<<NewType->getDescription()<<"\n";
#endif
+ }
}
- }
VarMap &NewPlane = NewTypeIt->second;
VarMap &OldPlane = TPI->second;
// No action
} else if (TI != NewPlane.end()) {
- // The only thing we are allowing for now is two method prototypes being
+ // The only thing we are allowing for now is two external global values
// folded into one.
//
- Method *ExistM = dyn_cast<Method>(TI->second);
- Method *NewM = dyn_cast<Method>(V.second);
+ GlobalValue *ExistGV = dyn_cast<GlobalValue>(TI->second);
+ GlobalValue *NewGV = dyn_cast<GlobalValue>(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...
+ if (ExistGV && NewGV && ExistGV->isExternal() && NewGV->isExternal()) {
+ // Ok we have two external global values. Make all uses of the new
+ // one use the old one...
//
- NewM->replaceAllUsesWith(ExistM);
+ assert(ExistGV->use_empty() && "No uses allowed on untyped value!");
+ //NewGV->replaceAllUsesWith(ExistGV);
// 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
// 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("");
+ NewGV->setName("");
InternallyInconsistent = false;
- // Now we can remove this method from the module entirely...
- NewM->getParent()->getMethodList().remove(NewM);
- delete NewM;
+ // Now we can remove this global from the module entirely...
+ Module *M = NewGV->getParent();
+ if (Function *F = dyn_cast<Function>(NewGV))
+ M->getFunctionList().remove(F);
+ else
+ M->getGlobalList().remove(cast<GlobalVariable>(NewGV));
+ delete NewGV;
} else {
- assert(0 && "Two ploanes folded together with overlapping "
+ assert(0 && "Two planes folded together with overlapping "
"value names!");
}
} else {
// Ok, now we are not referencing the type anymore... take me off your user
// list please!
#if DEBUG_ABSTYPE
- cerr << "Removing type " << OldType->getDescription() << endl;
+ cerr << "Removing type " << OldType->getDescription() << "\n";
#endif
OldType->removeAbstractTypeUser(this);
} else if (TPI != end()) {
assert(OldType == NewType);
#if DEBUG_ABSTYPE
- cerr << "Removing SELF type " << OldType->getDescription() << endl;
+ cerr << "Removing SELF type " << OldType->getDescription() << "\n";
#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() << "\n";
#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() << "\n";
#endif
- cast<const DerivedType>(NewType)->addAbstractTypeUser(this);
+ cast<const DerivedType>(NewType)->addAbstractTypeUser(this);
+ }
}
- }
+ }
}
-
-#ifndef NDEBUG
-#include "llvm/Assembly/Writer.h"
-#include <algorithm>
-
static void DumpVal(const pair<const string, Value *> &V) {
- cout << " '" << V.first << "' = " << V.second << "\n";
+ std::cout << " '" << V.first << "' = ";
+ V.second->dump();
+ std::cout << "\n";
}
static void DumpPlane(const pair<const Type *, map<const string, Value *> >&P) {
- cout << " Plane: " << P.first << "\n";
+ std::cout << " Plane: ";
+ P.first->dump();
+ std::cout << "\n";
for_each(P.second.begin(), P.second.end(), DumpVal);
}
void SymbolTable::dump() const {
- cout << "Symbol table dump:\n";
+ std::cout << "Symbol table dump:\n";
for_each(begin(), end(), DumpPlane);
-
- if (ParentSymTab) {
- cout << "Parent ";
- ParentSymTab->dump();
- }
}
-
-#endif
projects / oota-llvm.git / blobdiff