#include "llvm/SymbolTable.h"
#include "llvm/InstrTypes.h"
-#include "llvm/Support/StringExtras.h"
#include "llvm/DerivedTypes.h"
+#include "llvm/Module.h"
+#include "llvm/Method.h"
+#include "Support/StringExtras.h"
+
+#define DEBUG_SYMBOL_TABLE 0
+#define DEBUG_ABSTYPE 0
SymbolTable::~SymbolTable() {
// Drop all abstract type references in the type plane...
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";
LeftoverValues = false;
#endif
}
-SymbolTable::type_iterator SymbolTable::type_find(const Value *D) {
- assert(D->hasName() && "type_find(Value*) only works on named nodes!");
- return type_find(D->getType(), D->getName());
-}
-
-
-// find - returns end(Ty->getIDNumber()) on failure...
-SymbolTable::type_iterator SymbolTable::type_find(const Type *Ty,
- const string &Name) {
- iterator I = find(Ty);
- if (I == end()) { // Not in collection yet... insert dummy entry
- (*this)[Ty] = VarMap();
- I = find(Ty);
- assert(I != end() && "How did insert fail?");
- }
-
- return I->second.find(Name);
-}
-
// 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.
void SymbolTable::remove(Value *N) {
assert(N->hasName() && "Value doesn't have name!");
- assert(type_find(N) != type_end(N->getType()) &&
- "Value not in symbol table!");
- type_remove(type_find(N));
-}
+ iterator I = find(N->getType());
+ removeEntry(I, I->second.find(N->getName()));
+}
-#define DEBUG_SYMBOL_TABLE 0
+// 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!");
-Value *SymbolTable::type_remove(const type_iterator &It) {
- Value *Result = It->second;
+ Value *Result = Entry->second;
const Type *Ty = Result->getType();
#if DEBUG_SYMBOL_TABLE
cerr << this << " Removing Value: " << Result->getName() << endl;
#endif
// Remove the value from the plane...
- find(Ty)->second.erase(It);
+ Plane->second.erase(Entry);
+
+ // If the plane is empty, remove it now!
+ if (Plane->second.empty()) {
+ // If the plane represented an abstract type that we were interested in,
+ // unlink ourselves from this plane.
+ //
+ if (Plane->first->isAbstract()) {
+#if DEBUG_ABSTYPE
+ cerr << "Plane Empty: Removing type: " << Plane->first->getDescription()
+ << endl;
+#endif
+ cast<DerivedType>(Plane->first)->removeAbstractTypeUser(this);
+ }
+
+ erase(Plane);
+ }
// If we are removing an abstract type, remove the symbol table from it's use
// list...
if (Ty == Type::TypeTy) {
const Type *T = cast<const Type>(Result);
- if (T->isAbstract())
+ if (T->isAbstract()) {
+#if DEBUG_ABSTYPE
+ cerr << "Removing abs type from symtab" << T->getDescription() << endl;
+#endif
cast<DerivedType>(T)->removeAbstractTypeUser(this);
+ }
}
return Result;
// insertEntry - Insert a value into the symbol table with the specified
// name...
//
-void SymbolTable::insertEntry(const string &Name, Value *V) {
- const Type *VTy = V->getType();
-
- // TODO: The typeverifier should catch this when its implemented
- assert(lookup(VTy, Name) == 0 &&
- "SymbolTable::insertEntry - Name already in symbol table!");
+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);
+ InternallyInconsistent = true;
+ V->setName(UniqueName, this);
+ InternallyInconsistent = false;
+ return;
+ }
#if DEBUG_SYMBOL_TABLE
cerr << this << " Inserting definition: " << Name << ": "
iterator I = find(VTy);
if (I == end()) { // Not in collection yet... insert dummy entry
- (*this)[VTy] = VarMap();
- I = find(VTy);
+ // Insert a new empty element. I points to the new elements.
+ I = super::insert(make_pair(VTy, VarMap())).first;
assert(I != 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
+ // a new type plane.
+ //
+ if (VTy->isAbstract()) {
+ cast<DerivedType>(VTy)->addAbstractTypeUser(this);
+#if DEBUG_ABSTYPE
+ cerr << "Added abstract type value: " << VTy->getDescription() << endl;
+#endif
+ }
}
I->second.insert(make_pair(Name, V));
// If we are adding an abstract type, add the symbol table to it's use list.
if (VTy == Type::TypeTy) {
const Type *T = cast<const Type>(V);
- if (T->isAbstract())
+ if (T->isAbstract()) {
cast<DerivedType>(T)->addAbstractTypeUser(this);
+#if DEBUG_ABSTYPE
+ cerr << "Added abstract type to ST: " << T->getDescription() << endl;
+#endif
+ }
}
}
// 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
+
+ // 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 << "[Added] refined to abstype: "<<NewType->getDescription()<<endl;
+#endif
+ }
+ }
+
+ VarMap &NewPlane = NewTypeIt->second;
+ VarMap &OldPlane = TPI->second;
+ while (!OldPlane.empty()) {
+ pair<const string, Value*> V = *OldPlane.begin();
+
+ // Check to see if there is already a value in the symbol table that this
+ // would collide with.
+ type_iterator TI = NewPlane.find(V.first);
+ if (TI != NewPlane.end() && TI->second == V.second) {
+ // No action
+
+ } else if (TI != NewPlane.end()) {
+ // The only thing we are allowing for now is two method prototypes being
+ // folded into one.
+ //
+ Method *ExistM = dyn_cast<Method>(TI->second);
+ Method *NewM = dyn_cast<Method>(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.
+ //
+ InternallyInconsistent = true;
+
+ // Remove newM from the symtab
+ NewM->setName("");
+ InternallyInconsistent = false;
+
+ // Now we can remove this method from the module entirely...
+ NewM->getParent()->getMethodList().remove(NewM);
+ delete NewM;
+
+ } else {
+ assert(0 && "Two ploanes folded together with overlapping "
+ "value names!");
+ }
+ } else {
+ insertEntry(V.first, NewType, V.second);
- iterator TPI = find(Type::TypeTy);
+ }
+ // Remove the item from the old type plane
+ OldPlane.erase(OldPlane.begin());
+ }
+
+ // 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;
+#endif
+ OldType->removeAbstractTypeUser(this);
+
+ // 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
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;
+#endif
OldType->removeAbstractTypeUser(this);
+
I->second = (Value*)NewType; // TODO FIXME when types aren't const
- if (NewType->isAbstract())
+ if (NewType->isAbstract()) {
+#if DEBUG_ABSTYPE
+ cerr << "Added type " << NewType->getDescription() << endl;
+#endif
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 << endl;
}
static void DumpPlane(const pair<const Type *, map<const string, Value *> >&P) {
projects / oota-llvm.git / blobdiff