Fix problem with dangling referrers

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4595 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Analysis/DataStructure/IPModRef.cpp b/lib/Analysis/DataStructure/IPModRef.cpp
index 0f9da42531783c4a4148584f3818def31e521fd0..6b7095bcabd6626f35acff4a0be45b7e09b824d2 100644 (file)
--- a/lib/Analysis/DataStructure/IPModRef.cpp
+++ b/lib/Analysis/DataStructure/IPModRef.cpp
@@ -158,6 +158,9 @@ FunctionModRefInfo::computeModRef(const CallInst& callInst)
       if (csgNodes[i]->isRead())
         callModRefInfo->setNodeIsRef(getNodeId(origNodes[i]));
     }
+
+  // Drop nodemap before we delete the graph...
+  NodeMap.clear();
   delete csgp;
 }
 
@@ -194,7 +197,6 @@ void FunctionModRefInfo::dump() const
 // class IPModRef: An interprocedural pass that computes IP Mod/Ref info.
 //----------------------------------------------------------------------------
 
-
 // Free the FunctionModRefInfo objects cached in funcToModRefInfoMap.
 // 
 void IPModRef::releaseMemory()
@@ -215,6 +217,7 @@ void IPModRef::releaseMemory()
 bool IPModRef::run(Module &theModule)
 {
   M = &theModule;
+
   for (Module::const_iterator FI = M->begin(), FE = M->end(); FI != FE; ++FI)
     if (! FI->isExternal())
       getFuncInfo(*FI, /*computeIfMissing*/ true);

diff --git a/lib/Analysis/IPA/IPModRef.cpp b/lib/Analysis/IPA/IPModRef.cpp
index 0f9da42531783c4a4148584f3818def31e521fd0..6b7095bcabd6626f35acff4a0be45b7e09b824d2 100644 (file)
--- a/lib/Analysis/IPA/IPModRef.cpp
+++ b/lib/Analysis/IPA/IPModRef.cpp
@@ -158,6 +158,9 @@ FunctionModRefInfo::computeModRef(const CallInst& callInst)
       if (csgNodes[i]->isRead())
         callModRefInfo->setNodeIsRef(getNodeId(origNodes[i]));
     }
+
+  // Drop nodemap before we delete the graph...
+  NodeMap.clear();
   delete csgp;
 }
 
@@ -194,7 +197,6 @@ void FunctionModRefInfo::dump() const
 // class IPModRef: An interprocedural pass that computes IP Mod/Ref info.
 //----------------------------------------------------------------------------
 
-
 // Free the FunctionModRefInfo objects cached in funcToModRefInfoMap.
 // 
 void IPModRef::releaseMemory()
@@ -215,6 +217,7 @@ void IPModRef::releaseMemory()
 bool IPModRef::run(Module &theModule)
 {
   M = &theModule;
+
   for (Module::const_iterator FI = M->begin(), FE = M->end(); FI != FE; ++FI)
     if (! FI->isExternal())
       getFuncInfo(*FI, /*computeIfMissing*/ true);