mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-18 12:29:21 +00:00
bug 122:
- Module doesn't need to manage ConstantPointerRefs any more. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@14931 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
00dc479613
commit
0f7eea5d04
@ -56,17 +56,6 @@ iplist<GlobalVariable> &ilist_traits<GlobalVariable>::getList(Module *M) {
|
||||
template class SymbolTableListTraits<GlobalVariable, Module, Module>;
|
||||
template class SymbolTableListTraits<Function, Module, Module>;
|
||||
|
||||
// Define the GlobalValueRefMap as a struct that wraps a map so that we don't
|
||||
// have Module.h depend on <map>
|
||||
//
|
||||
namespace llvm {
|
||||
struct GlobalValueRefMap {
|
||||
typedef std::map<GlobalValue*, ConstantPointerRef*> MapTy;
|
||||
typedef MapTy::iterator iterator;
|
||||
std::map<GlobalValue*, ConstantPointerRef*> Map;
|
||||
};
|
||||
}
|
||||
|
||||
//===----------------------------------------------------------------------===//
|
||||
// Primitive Module methods.
|
||||
//
|
||||
@ -77,7 +66,6 @@ Module::Module(const std::string &MID)
|
||||
FunctionList.setParent(this);
|
||||
GlobalList.setItemParent(this);
|
||||
GlobalList.setParent(this);
|
||||
GVRefMap = 0;
|
||||
SymTab = new SymbolTable();
|
||||
}
|
||||
|
||||
@ -300,38 +288,5 @@ void Module::dropAllReferences() {
|
||||
|
||||
for(Module::giterator I = gbegin(), E = gend(); I != E; ++I)
|
||||
I->dropAllReferences();
|
||||
|
||||
// If there are any GlobalVariable references still out there, nuke them now.
|
||||
// Since all references are hereby dropped, nothing could possibly reference
|
||||
// them still. Note that destroying all of the constant pointer refs will
|
||||
// eventually cause the GVRefMap field to be set to null (by
|
||||
// destroyConstantPointerRef, below).
|
||||
//
|
||||
while (GVRefMap)
|
||||
// Delete the ConstantPointerRef node...
|
||||
GVRefMap->Map.begin()->second->destroyConstant();
|
||||
}
|
||||
|
||||
// Accessor for the underlying GlobalValRefMap...
|
||||
ConstantPointerRef *Module::getConstantPointerRef(GlobalValue *V){
|
||||
// Create ref map lazily on demand...
|
||||
if (GVRefMap == 0) GVRefMap = new GlobalValueRefMap();
|
||||
|
||||
GlobalValueRefMap::iterator I = GVRefMap->Map.find(V);
|
||||
if (I != GVRefMap->Map.end()) return I->second;
|
||||
|
||||
ConstantPointerRef *Ref = new ConstantPointerRef(V);
|
||||
GVRefMap->Map[V] = Ref;
|
||||
return Ref;
|
||||
}
|
||||
|
||||
void Module::destroyConstantPointerRef(ConstantPointerRef *CPR) {
|
||||
assert(GVRefMap && "No map allocated, but we have a CPR?");
|
||||
if (!GVRefMap->Map.erase(CPR->getValue())) // Remove it from the map...
|
||||
assert(0 && "ConstantPointerRef not found in module CPR map!");
|
||||
|
||||
if (GVRefMap->Map.empty()) { // If the map is empty, delete it.
|
||||
delete GVRefMap;
|
||||
GVRefMap = 0;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user