Remove gunk used by broken TD pass

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

1 files changed, 4 insertions, 12 deletions

diff --git a/lib/Analysis/DataStructure/BottomUpClosure.cpp b/lib/Analysis/DataStructure/BottomUpClosure.cpp
index ed9336d2b7..b3396dace9 100644
--- a/lib/Analysis/DataStructure/BottomUpClosure.cpp
+++ b/lib/Analysis/DataStructure/BottomUpClosure.cpp
@@ -23,9 +23,6 @@ using namespace DS;
 // our memory... here...
 //
 void BUDataStructures::releaseMemory() {
-  // Delete all call site information
-  CallSites.clear();
-
   for (map<const Function*, DSGraph*>::iterator I = DSInfo.begin(),
          E = DSInfo.end(); I != E; ++I)
     delete I->second;
@@ -62,7 +59,10 @@ DSGraph &BUDataStructures::calculateGraph(Function &F) {
 #endif
 
   // Start resolving calls...
-  std::vector<DSCallSite> &FCs = Graph->getFunctionCalls();
+  std::vector<DSCallSite> &FCs = Graph->getAuxFunctionCalls();
+
+  // Start with a copy of the original call sites...
+  FCs = Graph->getFunctionCalls();
 
   DEBUG(std::cerr << "  [BU] Inlining: " << F.getName() << "\n");
 
@@ -111,14 +111,6 @@ DSGraph &BUDataStructures::calculateGraph(Function &F) {
             DEBUG(std::cerr << "\t\t[BU] Got graph for " << FI.getName()
                   << " in: " << F.getName() << "\n");
 
-            // Record that the original DSCallSite was a call site of FI.
-            // This may or may not have been known when the DSCallSite was
-            // originally created.
-            std::vector<DSCallSite> &CallSitesForFunc = CallSites[&FI];
-            CallSitesForFunc.push_back(Call);
-            CallSitesForFunc.back().setResolvingCaller(&F);
-            CallSitesForFunc.back().setCallee(0);
-
             // Handle self recursion by resolving the arguments and return value
             Graph->mergeInGraph(Call, GI, DSGraph::StripAllocaBit);