[llvm-commits] [poolalloc] r98315 - in /poolalloc/trunk: include/dsa/DSCallGraph.h include/dsa/DSNode.h include/dsa/DataStructure.h include/dsa/sv/super_set.h include/poolalloc/PoolAllocate.h lib/DSA/BottomUpClosure.cpp lib/DSA/CompleteBottomUp.cpp lib/DSA/DSGraph.cpp lib/DSA/DataStructure.cpp lib/DSA/Local.cpp lib/DSA/Printer.cpp lib/DSA/TopDownClosure.cpp lib/PoolAllocate/RunTimeAssociate.cpp lib/PoolAllocate/TransformFunctionBody.cpp

Andrew Lenharth andrewl at lenharth.org
Thu Mar 11 16:16:42 PST 2010


Author: alenhar2
Date: Thu Mar 11 18:16:41 2010
New Revision: 98315

URL: http://llvm.org/viewvc/llvm-project?rev=98315&view=rev
Log:
Split out the callgraph and seperate DSGraph's impl from the big mess of stuff

Added:
    poolalloc/trunk/include/dsa/DSCallGraph.h
    poolalloc/trunk/lib/DSA/DSGraph.cpp
      - copied, changed from r98209, poolalloc/trunk/lib/DSA/DataStructure.cpp
Modified:
    poolalloc/trunk/include/dsa/DSNode.h
    poolalloc/trunk/include/dsa/DataStructure.h
    poolalloc/trunk/include/dsa/sv/super_set.h
    poolalloc/trunk/include/poolalloc/PoolAllocate.h
    poolalloc/trunk/lib/DSA/BottomUpClosure.cpp
    poolalloc/trunk/lib/DSA/CompleteBottomUp.cpp
    poolalloc/trunk/lib/DSA/DataStructure.cpp
    poolalloc/trunk/lib/DSA/Local.cpp
    poolalloc/trunk/lib/DSA/Printer.cpp
    poolalloc/trunk/lib/DSA/TopDownClosure.cpp
    poolalloc/trunk/lib/PoolAllocate/RunTimeAssociate.cpp
    poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp

Added: poolalloc/trunk/include/dsa/DSCallGraph.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/DSCallGraph.h?rev=98315&view=auto
==============================================================================
--- poolalloc/trunk/include/dsa/DSCallGraph.h (added)
+++ poolalloc/trunk/include/dsa/DSCallGraph.h Thu Mar 11 18:16:41 2010
@@ -0,0 +1,119 @@
+//===- DSCallGaph.h - Build call graphs -------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file was developed by the LLVM research group and is distributed under
+// the University of Illinois Open Source License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// Implement a detailed call graph for DSA.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_DSCALLGRAPH_H
+#define	LLVM_DSCALLGRAPH_H
+
+#include "dsa/sv/set.h"
+#include <map>
+
+#include "llvm/Support/CallSite.h"
+
+namespace llvm {
+class Function;
+}
+
+template<class Iter>
+class KeyIterator {
+  Iter I;
+public:
+  typedef typename Iter::difference_type difference_type;
+  typedef typename Iter::value_type::first_type value_type;
+  typedef typename Iter::value_type::first_type* pointer;
+  typedef typename Iter::value_type::first_type& reference;
+  typedef typename Iter::iterator_category iterator_category;
+
+  KeyIterator(Iter i) :I(i) {}
+  Iter base() const { return I; }
+  reference    operator*() const { return I->first; }
+  KeyIterator  operator+(difference_type n) const { return KeyIterator(I + n); }
+  KeyIterator& operator++() { ++I; return *this; }
+  KeyIterator  operator++(int) { Iter OI = I; ++I; return KeyIterator(OI); }
+  KeyIterator& operator+= (difference_type n) { I += n; return *this; }
+  KeyIterator  operator- (difference_type n) const { return KeyIterator(I - n); }
+  KeyIterator& operator--() { --I; return *this; }
+  KeyIterator  operator--(int) { Iter OI = I; --I; return KeyIterator(OI); }
+  KeyIterator& operator-=(difference_type n) { I -= n; return *this; }
+  pointer operator->() const { return &I->first; }
+  bool operator==(const KeyIterator& RHS) const { return I == RHS.I; }
+  bool operator!=(const KeyIterator& RHS) const { return I != RHS.I; }
+};
+
+class DSCallGraph {
+
+  typedef sv::set<const llvm::Function*> FuncSet;
+  typedef std::map<llvm::CallSite, FuncSet> ActualCalleesTy;
+
+  ActualCalleesTy ActualCallees;
+
+public:
+
+  typedef ActualCalleesTy::mapped_type::const_iterator iterator;
+  typedef KeyIterator<ActualCalleesTy::const_iterator> key_iterator;
+
+  void insert(llvm::CallSite CS, const llvm::Function* F) {
+    if (F) ActualCallees[CS].insert(F);
+  }
+
+  template<class Iterator>
+  void insert(llvm::CallSite CS, Iterator _begin, Iterator _end) {
+    for(; _begin != _end; ++_begin)
+      insert(CS, *_begin);
+  }
+
+  iterator callee_begin(llvm::CallSite CS) const {
+    ActualCalleesTy::const_iterator ii = ActualCallees.find(CS);
+    if (ii == ActualCallees.end())
+      ii = ActualCallees.find(llvm::CallSite());
+    return ii->second.begin();
+  }
+
+  iterator callee_end(llvm::CallSite CS) const {
+    ActualCalleesTy::const_iterator ii = ActualCallees.find(CS);
+    if (ii == ActualCallees.end())
+      ii = ActualCallees.find(llvm::CallSite());
+    return ii->second.end();
+  }
+
+
+  unsigned callee_size(llvm::CallSite CS) const {
+    ActualCalleesTy::const_iterator ii = ActualCallees.find(CS);
+    if (ii == ActualCallees.end())
+      return 0;
+    return ii->second.size();
+  }
+
+  unsigned size() const {
+    unsigned sum = 0;
+    for (ActualCalleesTy::const_iterator ii = ActualCallees.begin(),
+            ee = ActualCallees.end(); ii != ee; ++ii)
+      sum += ii->second.size();
+    return sum;
+  }
+
+  void clear() {
+    ActualCallees.clear();
+  }
+
+  key_iterator key_begin() const {
+    return key_iterator(ActualCallees.begin());
+  }
+
+  key_iterator key_end() const {
+    return key_iterator(ActualCallees.end());
+  }
+
+};
+
+#endif	/* LLVM_DSCALLGRAPH_H */
+

Modified: poolalloc/trunk/include/dsa/DSNode.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/DSNode.h?rev=98315&r1=98314&r2=98315&view=diff
==============================================================================
--- poolalloc/trunk/include/dsa/DSNode.h (original)
+++ poolalloc/trunk/include/dsa/DSNode.h Thu Mar 11 18:16:41 2010
@@ -15,7 +15,6 @@
 #define LLVM_ANALYSIS_DSNODE_H
 
 #include "dsa/DSSupport.h"
-#include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/ilist_node.h"
 
@@ -150,10 +149,12 @@
   inline const_iterator end() const;
 
   /// type_* - Provide iterators for accessing types.  Some types may be null
-  TyMapTy::iterator type_begin() { return TyMap.begin(); }
-  TyMapTy::iterator type_end()   { return TyMap.end(); }
-  TyMapTy::const_iterator type_begin() const { return TyMap.begin(); }
-  TyMapTy::const_iterator type_end()   const { return TyMap.end(); }
+  typedef TyMapTy::iterator type_iterator;
+  typedef TyMapTy::const_iterator const_type_iterator;
+  type_iterator type_begin() { return TyMap.begin(); }
+  type_iterator type_end()   { return TyMap.end(); }
+  const_type_iterator type_begin() const { return TyMap.begin(); }
+  const_type_iterator type_end()   const { return TyMap.end(); }
 
   /// edge_* - Provide iterators for accessing outgoing edges.  Some outgoing
   /// edges may be null.
@@ -248,6 +249,16 @@
   void mergeTypeInfo(const TyMapTy::mapped_type TyIt, unsigned Offset);
   void mergeTypeInfo(const DSNode* D, unsigned Offset);
 
+  // Types records might exist without types in them
+  bool hasNoType() {
+    type_iterator ii = type_begin(), ee = type_end();
+    while (ii != ee) {
+      if (ii->second) return false;
+      ++ii;
+    }
+    return true;
+  }
+
   /// foldNodeCompletely - If we determine that this node has some funny
   /// behavior happening to it that we cannot represent, we fold it down to a
   /// single, completely pessimistic, node.  This node is represented as a
@@ -382,6 +393,8 @@
   ///
   void forwardNode(DSNode *To, unsigned Offset);
 
+  void cleanEdges();
+
   void print(llvm::raw_ostream &O, const DSGraph *G) const;
   void dump() const;
 

Modified: poolalloc/trunk/include/dsa/DataStructure.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/DataStructure.h?rev=98315&r1=98314&r2=98315&view=diff
==============================================================================
--- poolalloc/trunk/include/dsa/DataStructure.h (original)
+++ poolalloc/trunk/include/dsa/DataStructure.h Thu Mar 11 18:16:41 2010
@@ -20,6 +20,7 @@
 #include "llvm/ADT/EquivalenceClasses.h"
 
 #include "dsa/EntryPointAnalysis.h"
+#include "dsa/DSCallGraph.h"
 #include "dsa/sv/set.h"
 #include "dsa/sv/super_set.h"
 
@@ -39,12 +40,8 @@
 FunctionPass *createDataStructureGraphCheckerPass();
 
 class DataStructures : public ModulePass {
-  typedef std::map<const Instruction*, sv::set<const Function*> > ActualCalleesTy;
   typedef std::map<const Function*, DSGraph*> DSInfoTy;
-public:
-  typedef sv::set<const Function*>::const_iterator callee_iterator;
-  
-private:
+
   /// TargetData, comes in handy
   TargetData* TD;
 
@@ -67,9 +64,6 @@
   // DSInfo, one graph for each function
   DSInfoTy DSInfo;
 
-  // Callgraph, as computed so far
-  ActualCalleesTy ActualCallees;
-
   // Name for printing
   const char* printname;
 
@@ -84,29 +78,16 @@
 
   SuperSet<const Type*>* TypeSS;
 
+  // Callgraph, as computed so far
+  DSCallGraph callgraph;
+
   void init(DataStructures* D, bool clone, bool printAuxCalls, bool copyGlobalAuxCalls, bool resetAux);
   void init(TargetData* T);
 
   void formGlobalECs();
 
-
-  void callee_add(const Instruction* I, const Function* F) {
-    ActualCallees[I].insert(F);
-  }
-
-  template<class Iterator>
-  void callee_add_many(const Instruction* I, Iterator _begin, Iterator _end) {
-    ActualCallees[I].insert(_begin,_end);
-//    typename ActualCalleesTy::mapped_type& S = ActualCallees[I];
-//    for (; _begin != _end; ++_begin)
-//      S.insert(*_begin);
-  }
-
   DataStructures(intptr_t id, const char* name) 
-    : ModulePass(id), TD(0), GraphSource(0), printname(name), GlobalsGraph(0) {
-    //a dummy node for empty call sites
-    ActualCallees[0];
-    
+    : ModulePass(id), TD(0), GraphSource(0), printname(name), GlobalsGraph(0) {  
     // For now, the graphs are owned by this pass
     DSGraphsStolen = false;
   }
@@ -117,39 +98,6 @@
   void print(llvm::raw_ostream &O, const Module *M) const;
   void dumpCallGraph() const;
 
-  callee_iterator callee_begin(const Instruction *I) const {
-    ActualCalleesTy::const_iterator ii = ActualCallees.find(I);
-    if (ii == ActualCallees.end())
-      ii = ActualCallees.find(0);
-    return ii->second.begin();
-  }
-
-  callee_iterator callee_end(const Instruction *I) const {
-    ActualCalleesTy::const_iterator ii = ActualCallees.find(I);
-    if (ii == ActualCallees.end())
-      ii = ActualCallees.find(0);
-    return ii->second.end();
-  }
-
-  void callee_site(const Instruction* I) {
-    ActualCallees[I];
-  }
-
-  unsigned callee_size() const {
-    unsigned sum = 0;
-    for (ActualCalleesTy::const_iterator ii = ActualCallees.begin(),
-           ee = ActualCallees.end(); ii != ee; ++ii)
-      sum += ii->second.size();
-    return sum;
-  }
-
-  void callee_get_keys(std::vector<const Instruction*>& keys) {
-    for (ActualCalleesTy::const_iterator ii = ActualCallees.begin(),
-           ee = ActualCallees.end(); ii != ee; ++ii)
-      if (ii->first)
-        keys.push_back(ii->first);
-  }
-
   virtual void releaseMemory();
 
   virtual bool hasDSGraph(const Function &F) const {
@@ -176,6 +124,8 @@
 
   TargetData& getTargetData() const { return *TD; }
 
+  const DSCallGraph& getCallGraph() const { return callgraph; }
+
   SuperSet<const Type*>& getTypeSS() const { return *TypeSS; }
   
   /// deleteValue/copyValue - Interfaces to update the DSGraphs in the program.

Modified: poolalloc/trunk/include/dsa/sv/super_set.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/sv/super_set.h?rev=98315&r1=98314&r2=98315&view=diff
==============================================================================
--- poolalloc/trunk/include/dsa/sv/super_set.h (original)
+++ poolalloc/trunk/include/dsa/sv/super_set.h Thu Mar 11 18:16:41 2010
@@ -16,6 +16,7 @@
 
 template<typename Ty>
 class SuperSet {
+  //std::set provides stable iterators, and that matters a lot
   typedef sv::set<Ty> InnerSetTy;
   typedef std::set<InnerSetTy> OuterSetTy;
   OuterSetTy container;
@@ -23,6 +24,7 @@
   typedef const typename OuterSetTy::value_type* setPtr;
 
   setPtr getOrCreate(sv::set<Ty>& S) {
+    if (S.empty()) return 0;
     return &(*container.insert(S).first);
   }
 

Modified: poolalloc/trunk/include/poolalloc/PoolAllocate.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/poolalloc/PoolAllocate.h?rev=98315&r1=98314&r2=98315&view=diff
==============================================================================
--- poolalloc/trunk/include/poolalloc/PoolAllocate.h (original)
+++ poolalloc/trunk/include/poolalloc/PoolAllocate.h Thu Mar 11 18:16:41 2010
@@ -147,8 +147,6 @@
 
   virtual Value * getGlobalPool (const DSNode * Node) {return 0;}
 
-  virtual DataStructures::callee_iterator callee_begin (Instruction *I) { return Graphs->callee_begin(I);}
-  virtual DataStructures::callee_iterator callee_end   (Instruction *I) { return Graphs->callee_end(I);}
 };
 
 /// PoolAllocate - The main pool allocation pass
@@ -366,16 +364,6 @@
       return I->second;
   }
 
-  virtual DataStructures::callee_iterator
-  callee_begin (Instruction * I) {
-    return Graphs->callee_begin(I);
-  }
-
-  virtual DataStructures::callee_iterator
-  callee_end (Instruction * I) {
-    return Graphs->callee_end(I);
-  }
-
 protected:
   
   /// AddPoolPrototypes - Add prototypes for the pool functions to the

Modified: poolalloc/trunk/lib/DSA/BottomUpClosure.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/BottomUpClosure.cpp?rev=98315&r1=98314&r2=98315&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/BottomUpClosure.cpp (original)
+++ poolalloc/trunk/lib/DSA/BottomUpClosure.cpp Thu Mar 11 18:16:41 2010
@@ -45,6 +45,13 @@
   return runOnModuleInternal(M);
 }
 
+// BU:
+// Construct the callgraph from the local graphs
+// Find SCCs
+// inline bottum up
+//
+// We must split these out (they were merged in PLDI07) to handle multiple
+// entry-points correctly.
 bool BUDataStructures::runOnModuleInternal(Module& M) {
   std::vector<const Function*> Stack;
   std::map<const Function*, unsigned> ValMap;
@@ -59,24 +66,24 @@
     if (!hasDSGraph(**ii)) {
       errs() << debugname << ": Main Function: " << (*ii)->getName() << "\n";
       calculateGraphs(*ii, Stack, NextID, ValMap);
-      CloneAuxIntoGlobal(getDSGraph(**ii));
+      //CloneAuxIntoGlobal(getDSGraph(**ii));
     }
 
-  //errs() << "done main Funcs\n";
+  errs() << "done main Funcs\n";
 
   // Calculate the graphs for any functions that are unreachable from main...
   for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
     if (!I->isDeclaration() && !hasDSGraph(*I)) {
-      DEBUG(
+      //DEBUG(
             if (EntryPoints.size())
             errs() << debugname << ": Function unreachable from main: "
             << I->getName() << "\n";
-      );
+      //);
       calculateGraphs(I, Stack, NextID, ValMap); // Calculate all graphs.
-      CloneAuxIntoGlobal(getDSGraph(*I));
+      //CloneAuxIntoGlobal(getDSGraph(*I));
     }
 
-  //errs() << "done unreachable Funcs\n";
+  errs() << "done unreachable Funcs\n";
 
   // If we computed any temporary indcallgraphs, free them now.
   for (std::map<std::vector<const Function*>,
@@ -117,7 +124,7 @@
                                    DSGraph::IgnoreGlobals);
   }
 
-  NumCallEdges += callee_size();
+  NumCallEdges += callgraph.size();
 
   return false;
 }
@@ -371,7 +378,6 @@
     DEBUG(Graph->AssertGraphOK(); Graph->getGlobalsGraph()->AssertGraphOK());
     
     DSCallSite &CS = *TempFCs.begin();
-    Instruction *TheCall = CS.getCallSite().getInstruction();
 
     CalledFuncs.clear();
 
@@ -380,7 +386,7 @@
     if (CS.getRetVal().isNull() && CS.getNumPtrArgs() == 0) {
       if (!CS.isDirectCall()) {
         GetAnyCallees(CS, CalledFuncs);
-        callee_add_many(TheCall, CalledFuncs.begin(), CalledFuncs.end());
+        callgraph.insert(CS.getCallSite(), CalledFuncs.begin(), CalledFuncs.end());
       }
       TempFCs.erase(TempFCs.begin());
       continue;
@@ -392,7 +398,7 @@
       //Get any callees we do have for the callgraph
       if (!CS.isDirectCall()) {
         GetAnyCallees(CS, CalledFuncs);
-        callee_add_many(TheCall, CalledFuncs.begin(), CalledFuncs.end());
+        callgraph.insert(CS.getCallSite(), CalledFuncs.begin(), CalledFuncs.end());
       }
       // Remember that we could not resolve this yet!
       AuxCallsList.splice(AuxCallsList.end(), TempFCs, TempFCs.begin());
@@ -401,9 +407,7 @@
 
     DSGraph *GI;
     
-    for (std::vector<const Function*>::iterator ii = CalledFuncs.begin(), ee = CalledFuncs.end();
-         ii != ee; ++ii) 
-      callee_add(TheCall, *ii);
+    callgraph.insert(CS.getCallSite(), CalledFuncs.begin(), CalledFuncs.end());
 
     if (CalledFuncs.size() == 1) {
       const Function *Callee = CalledFuncs[0];
@@ -510,7 +514,7 @@
   // reach live nodes as live.
   Graph->removeDeadNodes(DSGraph::KeepUnreachableGlobals);
 
-  cloneIntoGlobals(Graph);
+//  cloneIntoGlobals(Graph);
   //Graph.writeGraphToFile(cerr, "bu_" + F.getName());
 }
 

Modified: poolalloc/trunk/lib/DSA/CompleteBottomUp.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/CompleteBottomUp.cpp?rev=98315&r1=98314&r2=98315&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/CompleteBottomUp.cpp (original)
+++ poolalloc/trunk/lib/DSA/CompleteBottomUp.cpp Thu Mar 11 18:16:41 2010
@@ -44,16 +44,15 @@
   // Loop over all of the indirect calls in the program.  If a call site can
   // call multiple different functions, we need to unify all of the callees into
   // the same equivalence class.
-  std::vector<const Instruction*> keys;
-  callee_get_keys(keys);
 
   DSGraph* G = getGlobalsGraph();
   DSGraph::ScalarMapTy& SM = G->getScalarMap();
 
   //mege nodes in the global graph for these functions
-  for (std::vector<const Instruction*>::iterator ii = keys.begin(), ee = keys.end();
-       ii != ee; ++ii) {
-    callee_iterator csi = callee_begin(*ii), cse = callee_end(*ii);
+  for (DSCallGraph::key_iterator ii = callgraph.key_begin(),
+       ee = callgraph.key_end(); ii != ee; ++ii) {
+    DSCallGraph::iterator csi = callgraph.callee_begin(*ii),
+            cse = callgraph.callee_end(*ii);
     if (csi != cse && SM.find(*csi) != SM.end()) {
       DSNodeHandle& SrcNH = SM.find(*csi)->second;
       ++csi;

Copied: poolalloc/trunk/lib/DSA/DSGraph.cpp (from r98209, poolalloc/trunk/lib/DSA/DataStructure.cpp)
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DSGraph.cpp?p2=poolalloc/trunk/lib/DSA/DSGraph.cpp&p1=poolalloc/trunk/lib/DSA/DataStructure.cpp&r1=98209&r2=98315&rev=98315&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/DataStructure.cpp (original)
+++ poolalloc/trunk/lib/DSA/DSGraph.cpp Thu Mar 11 18:16:41 2010
@@ -38,766 +38,13 @@
 
 #define COLLAPSE_ARRAYS_AGGRESSIVELY 0
 namespace {
-  STATISTIC (NumFolds, "Number of nodes completely folded");
   STATISTIC (NumCallNodesMerged, "Number of call nodes merged");
-  STATISTIC (NumNodeAllocated  , "Number of nodes allocated");
   STATISTIC (NumDNE            , "Number of nodes removed by reachability");
   STATISTIC (NumTrivialDNE     , "Number of nodes trivially removed");
   STATISTIC (NumTrivialGlobalDNE, "Number of globals trivially removed");
   static cl::opt<unsigned>
-  DSAFieldLimit("dsa-field-limit", cl::Hidden,
-                cl::desc("Number of fields to track before collapsing a node"),
-                cl::init(256));
-}
-
-/// isForwarding - Return true if this NodeHandle is forwarding to another
-/// one.
-bool DSNodeHandle::isForwarding() const {
-  return N && N->isForwarding();
-}
-
-DSNode *DSNodeHandle::HandleForwarding() const {
-  assert(N->isForwarding() && "Can only be invoked if forwarding!");
-  DEBUG(
-        { //assert not looping
-          DSNode* NH = N;
-          sv::set<DSNode*> seen;
-          while(NH && NH->isForwarding()) {
-            assert(seen.find(NH) == seen.end() && "Loop detected");
-            seen.insert(NH);
-            NH = NH->ForwardNH.N;
-          }
-        }
-        );
-  // Handle node forwarding here!
-  DSNode *Next = N->ForwardNH.getNode();  // Cause recursive shrinkage
-  Offset += N->ForwardNH.getOffset();
-
-  if (--N->NumReferrers == 0) {
-    // Removing the last referrer to the node, sever the forwarding link
-    N->stopForwarding();
-  }
-
-  N = Next;
-  N->NumReferrers++;
-
-  if (N->getSize() <= Offset) {
-    assert(N->getSize() <= 1 && "Forwarded to shrunk but not collapsed node?");
-    Offset = 0;
-  }
-  return N;
-}
-
-//===----------------------------------------------------------------------===//
-// DSScalarMap Implementation
-//===----------------------------------------------------------------------===//
-
-DSNodeHandle &DSScalarMap::AddGlobal(const GlobalValue *GV) {
-  assert(ValueMap.count(GV) == 0 && "GV already exists!");
-
-  // If the node doesn't exist, check to see if it's a global that is
-  // equated to another global in the program.
-  EquivalenceClasses<const GlobalValue*>::iterator ECI = GlobalECs.findValue(GV);
-  if (ECI != GlobalECs.end()) {
-    const GlobalValue *Leader = *GlobalECs.findLeader(ECI);
-    if (Leader != GV) {
-      GV = Leader;
-      iterator I = ValueMap.find(GV);
-      if (I != ValueMap.end())
-        return I->second;
-    }
-  }
-
-  // Okay, this is either not an equivalenced global or it is the leader, it
-  // will be inserted into the scalar map now.
-  GlobalSet.insert(GV);
-
-  return ValueMap.insert(std::make_pair(GV, DSNodeHandle())).first->second;
-}
-
-//===----------------------------------------------------------------------===//
-// DSNode Implementation
-//===----------------------------------------------------------------------===//
-
-DSNode::DSNode(DSGraph *G)
-: NumReferrers(0), Size(0), ParentGraph(G), NodeType(0) {
-  // Add the type entry if it is specified...
-  if (G) G->addNode(this);
-  ++NumNodeAllocated;
-}
-
-// DSNode copy constructor... do not copy over the referrers list!
-DSNode::DSNode(const DSNode &N, DSGraph *G, bool NullLinks)
-  : NumReferrers(0), Size(N.Size), ParentGraph(G), TyMap(N.TyMap),
-    Globals(N.Globals), NodeType(N.NodeType) {
-  if (!NullLinks) Links = N.Links;
-  G->addNode(this);
-  ++NumNodeAllocated;
-}
-
-DSNode::~DSNode() {
-  dropAllReferences();
-  assert(hasNoReferrers() && "Referrers to dead node exist!");
-}
-
-void DSNode::assertOK() const {
-//  assert(((Ty && Ty->getTypeID() != Type::VoidTyID) ||
-//         ((!Ty || Ty->getTypeID() == Type::VoidTyID) && (Size == 0 ||
-//         (NodeType & DSNode::ArrayNode)))) &&
-//         "Node not OK!");
-
-  assert(ParentGraph && "Node has no parent?");
-  const DSScalarMap &SM = ParentGraph->getScalarMap();
-  for (globals_iterator ii = globals_begin(), ee = globals_end();
-       ii != ee; ++ii) {
-    assert(SM.global_count(*ii));
-    assert(SM.find(*ii)->second.getNode() == this);
-  }
-}
-
-/// forwardNode - Mark this node as being obsolete, and all references to it
-/// should be forwarded to the specified node and offset.
-///
-void DSNode::forwardNode(DSNode *To, unsigned Offset) {
-  assert(this != To && "Cannot forward a node to itself!");
-  assert(ForwardNH.isNull() && "Already forwarding from this node!");
-  if (To->Size <= 1) Offset = 0;
-  assert((Offset < To->Size || (Offset == To->Size && Offset == 0)) &&
-         "Forwarded offset is wrong!");
-  ForwardNH.setTo(To, Offset);
-  NodeType = DeadNode;
-  Size = 0;
-
-  DSNodeHandle ToNH(To,Offset);
-
-  //Move the Links
-  for (unsigned x = 0, xe = Links.size(); x != xe; ++x)
-    if (!Links[x].isNull()) {
-      // Compute the offset into the current node at which to
-      // merge this link.  In the common case, this is a linear
-      // relation to the offset in the original node (with
-      // wrapping), but if the current node gets collapsed due to
-      // recursive merging, we must make sure to merge in all remaining
-      // links at offset zero.
-      unsigned MergeOffset = 0;
-      if (ToNH.getNode()->getSize() != 1)
-        MergeOffset = (x + Offset) % ToNH.getNode()->getSize();
-      ToNH.getNode()->addEdgeTo(MergeOffset, Links[x]);
-    }
-  Links.clear();
-
-  // Remove this node from the parent graph's Nodes list.
-  ParentGraph->unlinkNode(this);
-  ParentGraph = 0;
-}
-
-// addGlobal - Add an entry for a global value to the Globals list.  This also
-// marks the node with the 'G' flag if it does not already have it.
-//
-void DSNode::addGlobal(const GlobalValue *GV) {
-  // First, check to make sure this is the leader if the global is in an
-  // equivalence class.
-  GV = getParentGraph()->getScalarMap().getLeaderForGlobal(GV);
-
-  Globals.insert(GV);
-  setGlobalMarker();
-}
-
-void DSNode::addFunction(const Function* F) {
-  addGlobal(F);
-}
-
-// removeGlobal - Remove the specified global that is explicitly in the globals
-// list.
-void DSNode::removeGlobal(const GlobalValue *GV) {
-  assert (Globals.count(GV) && "Global not in Node!");
-  Globals.erase(GV);
-}
-
-/// foldNodeCompletely - If we determine that this node has some funny
-/// behavior happening to it that we cannot represent, we fold it down to a
-/// single, completely pessimistic, node.  This node is represented as a
-/// single byte with a single TypeEntry of "void".
-///
-void DSNode::foldNodeCompletely() {
-  if (isNodeCompletelyFolded()) return;  // If this node is already folded...
-
-//  assert(0 && "Folding is happening");
-
-  ++NumFolds;
-
-  //Collapsed nodes don't really need a type
-  TyMap.clear();
-
-  // If this node has a size that is <= 1, we don't need to create a forwarding
-  // node.
-  if (getSize() <= 1) {
-    setCollapsedMarker();
-    Size = 1;
-    assert(Links.size() <= 1 && "Size is 1, but has more links?");
-  } else {
-    // Create the node we are going to forward to.  This is required because
-    // some referrers may have an offset that is > 0.  By forcing them to
-    // forward, the forwarder has the opportunity to correct the offset.
-    DSNode *DestNode = new DSNode(ParentGraph);
-    DestNode->NodeType = NodeType;
-    DestNode->setCollapsedMarker();
-    DestNode->Size = 1;
-    DestNode->Globals.swap(Globals);
-
-    // Start forwarding to the destination node...
-    forwardNode(DestNode, 0);
-
-  }
-}
-
-/// isNodeCompletelyFolded - Return true if this node has been completely
-/// folded down to something that can never be expanded, effectively losing
-/// all of the field sensitivity that may be present in the node.
-///
-bool DSNode::isNodeCompletelyFolded() const {
-  return  isCollapsedNode();
-}
-
-/// addFullGlobalsList - Compute the full set of global values that are
-/// represented by this node.  Unlike getGlobalsList(), this requires fair
-/// amount of work to compute, so don't treat this method call as free.
-void DSNode::addFullGlobalsList(std::vector<const GlobalValue*> &List) const {
-  if (globals_begin() == globals_end()) return;
-
-  EquivalenceClasses<const GlobalValue*> &EC = getParentGraph()->getGlobalECs();
-
-  for (globals_iterator I = globals_begin(), E = globals_end(); I != E; ++I) {
-    EquivalenceClasses<const GlobalValue*>::iterator ECI = EC.findValue(*I);
-    if (ECI == EC.end())
-      List.push_back(*I);
-    else
-      List.insert(List.end(), EC.member_begin(ECI), EC.member_end());
-  }
-}
-
-/// addFullFunctionList - Identical to addFullGlobalsList, but only return the
-/// functions in the full list.
-void DSNode::addFullFunctionList(std::vector<const Function*> &List) const {
-  if (globals_begin() == globals_end()) return;
-
-  EquivalenceClasses<const GlobalValue*> &EC = getParentGraph()->getGlobalECs();
-
-  for (globals_iterator I = globals_begin(), E = globals_end(); I != E; ++I) {
-    EquivalenceClasses<const GlobalValue*>::iterator ECI = EC.findValue(*I);
-    if (ECI == EC.end()) {
-      if (const Function *F = dyn_cast<Function>(*I))
-        List.push_back(F);
-    } else {
-      for (EquivalenceClasses<const GlobalValue*>::member_iterator MI =
-             EC.member_begin(ECI), E = EC.member_end(); MI != E; ++MI)
-        if (const Function *F = dyn_cast<Function>(*MI))
-          List.push_back(F);
-    }
-  }
-}
-
-/// mergeTypeInfo - This method merges the specified type into the current node
-/// at the specified offset.  This may update the current node's type record if
-/// this gives more information to the node, it may do nothing to the node if
-/// this information is already known, or it may merge the node completely (and
-/// return true) if the information is incompatible with what is already known.
-///
-/// This method returns true if the node is completely folded, otherwise false.
-///
-void DSNode::mergeTypeInfo(const Type *NewTy, unsigned Offset) {
-
-  if (!NewTy || NewTy->isVoidTy()) return;
-
-  if (isCollapsedNode()) return;
-  if (isArrayNode()) Offset %= getSize();
-
-  if (Offset >= getSize()) growSize(Offset+1);
-
-  TyMap[Offset] = getParentGraph()->getTypeSS().getOrCreate(TyMap[Offset], NewTy);
-}
-
-void DSNode::mergeTypeInfo(const TyMapTy::mapped_type TyIt, unsigned Offset) {
-  if (isCollapsedNode()) return;
-  if (isArrayNode()) Offset %= getSize();
-
-  if (Offset >= getSize())
-    growSize(Offset + 1);
-
-  if (!TyMap[Offset])
-    TyMap[Offset] = TyIt;
-  if (TyIt) {
-    sv::set<const Type*> S(*TyMap[Offset]);
-    S.insert(TyIt->begin(), TyIt->end());
-    TyMap[Offset] = getParentGraph()->getTypeSS().getOrCreate(S);
-  }
-}
-
-void DSNode::mergeTypeInfo(const DSNode* DN, unsigned Offset) {
-  if (isCollapsedNode()) return;
-
-  for (TyMapTy::const_iterator ii = DN->TyMap.begin(), ee = DN->TyMap.end();
-       ii != ee; ++ii)
-    mergeTypeInfo(ii->second, ii->first + Offset);
-}
-
-/// addEdgeTo - Add an edge from the current node to the specified node.  This
-/// can cause merging of nodes in the graph.
-///
-void DSNode::addEdgeTo(unsigned Offset, const DSNodeHandle &NH) {
-  if (NH.isNull()) return;       // Nothing to do
-
-  if (isNodeCompletelyFolded())
-    Offset = 0;
-
-  DSNodeHandle &ExistingEdge = getLink(Offset);
-  if (!ExistingEdge.isNull()) {
-    // Merge the two nodes...
-    ExistingEdge.mergeWith(NH);
-  } else {                             // No merging to perform...
-    setLink(Offset, NH);               // Just force a link in there...
-  }
-}
-
-
-void DSNode::mergeGlobals(const DSNode &RHS) {
-  Globals.insert(RHS.Globals.begin(), RHS.Globals.end());
-}
-
-static unsigned gcd(unsigned m, unsigned n) {
-  if (m < n) return gcd(n,m);
-  unsigned r = m % n;
-  if (r == 0) {
-    return n;
-  } else {
-    return gcd(n, r);
-  }
-}
-
-// MergeNodes - Helper function for DSNode::mergeWith().
-// This function does the hard work of merging two nodes, CurNodeH
-// and NH after filtering out trivial cases and making sure that
-// CurNodeH.offset >= NH.offset.
-//
-// ***WARNING***
-// Since merging may cause either node to go away, we must always
-// use the node-handles to refer to the nodes.  These node handles are
-// automatically updated during merging, so will always provide access
-// to the correct node after a merge.
-//
-void DSNode::MergeNodes(DSNodeHandle& CurNodeH, DSNodeHandle& NH) {
-  assert(CurNodeH.getOffset() >= NH.getOffset() &&
-         "This should have been enforced in the caller.");
-  assert(CurNodeH.getNode()->getParentGraph()==NH.getNode()->getParentGraph() &&
-         "Cannot merge two nodes that are not in the same graph!");
-
-  // Now we know that Offset >= NH.Offset, so convert it so our "Offset" (with
-  // respect to NH.Offset) is now zero.  NOffset is the distance from the base
-  // of our object that N starts from.
-  //
-  unsigned NOffset = CurNodeH.getOffset()-NH.getOffset();
-  unsigned NSize = NH.getNode()->getSize();
-
-  // If the two nodes are of different size, and the smaller node has the array
-  // bit set, collapse!
-  if (NSize != CurNodeH.getNode()->getSize()) {
-#if COLLAPSE_ARRAYS_AGGRESSIVELY
-    if (NSize < CurNodeH.getNode()->getSize()) {
-      if (NH.getNode()->isArray())
-        NH.getNode()->foldNodeCompletely();
-    } else if (CurNodeH.getNode()->isArray()) {
-      NH.getNode()->foldNodeCompletely();
-    }
-#endif
-  }
-
-  // If we are merging a node with a completely folded node, then both nodes are
-  // now completely folded.
-  //
-  if (CurNodeH.getNode()->isNodeCompletelyFolded()) {
-    if (!NH.getNode()->isNodeCompletelyFolded()) {
-      NH.getNode()->foldNodeCompletely();
-      assert(NH.getNode() && NH.getOffset() == 0 &&
-             "folding did not make offset 0?");
-      NOffset = NH.getOffset();
-      NSize = NH.getNode()->getSize();
-      assert(NOffset == 0 && NSize == 1);
-    }
-  } else if (NH.getNode()->isNodeCompletelyFolded()) {
-    CurNodeH.getNode()->foldNodeCompletely();
-    assert(CurNodeH.getNode() && CurNodeH.getOffset() == 0 &&
-           "folding did not make offset 0?");
-    NSize = NH.getNode()->getSize();
-    NOffset = NH.getOffset();
-    assert(NOffset == 0 && NSize == 1);
-  } 
-
-  DSNode *N = NH.getNode();
-  if (CurNodeH.getNode() == N || N == 0) return;
-  assert(!CurNodeH.getNode()->isDeadNode());
-
-  // Merge the type entries of the two nodes together...
-  CurNodeH.getNode()->mergeTypeInfo(NH.getNode(), NOffset);
-  if (NH.getNode()->getSize() + NOffset > CurNodeH.getNode()->getSize())
-    CurNodeH.getNode()->growSize(NH.getNode()->getSize() + NOffset);
-  assert(!CurNodeH.getNode()->isDeadNode());
-
-  // Merge the NodeType information.
-  CurNodeH.getNode()->NodeType |= N->NodeType;
-
-  // Start forwarding to the new node!
-  N->forwardNode(CurNodeH.getNode(), NOffset);
-  assert(!CurNodeH.getNode()->isDeadNode());
-
-  // Merge the globals list...
-  CurNodeH.getNode()->mergeGlobals(*N);
-
-  // Delete the globals from the old node...
-  N->Globals.clear();
-}
-
-
-/// mergeWith - Merge this node and the specified node, moving all links to and
-/// from the argument node into the current node, deleting the node argument.
-/// Offset indicates what offset the specified node is to be merged into the
-/// current node.
-///
-/// The specified node may be a null pointer (in which case, we update it to
-/// point to this node).
-///
-void DSNode::mergeWith(const DSNodeHandle &NH, unsigned Offset) {
-  //DOUT << "mergeWith: " << this << " becomes " << NH.getNode() << "\n";
-  DSNode *N = NH.getNode();
-  if (N == this && NH.getOffset() == Offset)
-    return;  // Noop
-
-  // If the RHS is a null node, make it point to this node!
-  if (N == 0) {
-    NH.mergeWith(DSNodeHandle(this, Offset));
-    return;
-  }
-
-  assert(!N->isDeadNode() && !isDeadNode());
-  assert(!hasNoReferrers() && "Should not try to fold a useless node!");
-
-  if (N == this) {
-    // We cannot merge two pieces of the same node together, collapse the node
-    // completely.
-    DEBUG(errs() << "Attempting to merge two chunks of the same node together!\n");
-    foldNodeCompletely();
-    return;
-  }
-
-  // If both nodes are not at offset 0, make sure that we are merging the node
-  // at an later offset into the node with the zero offset.
-  //
-  if (Offset < NH.getOffset()) {
-    N->mergeWith(DSNodeHandle(this, Offset), NH.getOffset());
-    return;
-  } else if (Offset == NH.getOffset() && getSize() < N->getSize()) {
-    // If the offsets are the same, merge the smaller node into the bigger node
-    N->mergeWith(DSNodeHandle(this, Offset), NH.getOffset());
-    return;
-  }
-
-  // Ok, now we can merge the two nodes.  Use a static helper that works with
-  // two node handles, since "this" may get merged away at intermediate steps.
-  DSNodeHandle CurNodeH(this, Offset);
-  DSNodeHandle NHCopy(NH);
-  if (CurNodeH.getOffset() >= NHCopy.getOffset())
-    DSNode::MergeNodes(CurNodeH, NHCopy);
-  else
-    DSNode::MergeNodes(NHCopy, CurNodeH);
-}
-
-
-//===----------------------------------------------------------------------===//
-// ReachabilityCloner Implementation
-//===----------------------------------------------------------------------===//
-
-DSNodeHandle ReachabilityCloner::getClonedNH(const DSNodeHandle &SrcNH) {
-  if (SrcNH.isNull()) return DSNodeHandle();
-  const DSNode *SN = SrcNH.getNode();
-
-  DSNodeHandle &NH = NodeMap[SN];
-  if (!NH.isNull()) { // Node already mapped?
-    DSNode *NHN = NH.getNode();
-    return DSNodeHandle(NHN, NH.getOffset() + SrcNH.getOffset());
-  }
-  
-  // If SrcNH has globals and the destination graph has one of the same globals,
-  // merge this node with the destination node, which is much more efficient.
-  if (SN->globals_begin() != SN->globals_end()) {
-    DSScalarMap &DestSM = Dest->getScalarMap();
-    for (DSNode::globals_iterator I = SN->globals_begin(),E = SN->globals_end();
-         I != E; ++I) {
-      const GlobalValue *GV = *I;
-      DSScalarMap::iterator GI = DestSM.find(GV);
-      if (GI != DestSM.end() && !GI->second.isNull()) {
-        // We found one, use merge instead!
-        merge(GI->second, Src->getNodeForValue(GV));
-        assert(!NH.isNull() && "Didn't merge node!");
-        DSNode *NHN = NH.getNode();
-        return DSNodeHandle(NHN, NH.getOffset()+SrcNH.getOffset());
-      }
-    }
-  }
-
-  if (!createDest) return DSNodeHandle(0,0);
-
-  DSNode *DN = new DSNode(*SN, Dest, true /* Null out all links */);
-  DN->maskNodeTypes(BitsToKeep);
-  NH = DN;
-  //DOUT << "getClonedNH: " << SN << " becomes " << DN << "\n";
-
-  // Next, recursively clone all outgoing links as necessary.  Note that
-  // adding these links can cause the node to collapse itself at any time, and
-  // the current node may be merged with arbitrary other nodes.  For this
-  // reason, we must always go through NH.
-  DN = 0;
-  for (DSNode::const_edge_iterator ii = SN->edge_begin(), ee = SN->edge_end();
-       ii != ee; ++ii) {
-    const DSNodeHandle &SrcEdge = ii->second;
-    if (!SrcEdge.isNull()) {
-      const DSNodeHandle &DestEdge = getClonedNH(SrcEdge);
-      // Compute the offset into the current node at which to
-      // merge this link.  In the common case, this is a linear
-      // relation to the offset in the original node (with
-      // wrapping), but if the current node gets collapsed due to
-      // recursive merging, we must make sure to merge in all remaining
-      // links at offset zero.
-      unsigned MergeOffset = 0;
-      DSNode *CN = NH.getNode();
-      if (CN->getSize() != 1)
-        MergeOffset = (ii->first + NH.getOffset()) % CN->getSize();
-      CN->addEdgeTo(MergeOffset, DestEdge);
-    }
-  }
-
-  // If this node contains any globals, make sure they end up in the scalar
-  // map with the correct offset.
-  for (DSNode::globals_iterator I = SN->globals_begin(), E = SN->globals_end();
-       I != E; ++I) {
-    const GlobalValue *GV = *I;
-    const DSNodeHandle &SrcGNH = Src->getNodeForValue(GV);
-    DSNodeHandle &DestGNH = NodeMap[SrcGNH.getNode()];
-    assert(DestGNH.getNode() == NH.getNode() &&"Global mapping inconsistent");
-    Dest->getNodeForValue(GV).mergeWith(DSNodeHandle(DestGNH.getNode(),
-                                        DestGNH.getOffset()+SrcGNH.getOffset()));
-  }
-  NH.getNode()->mergeGlobals(*SN);
-
-  return DSNodeHandle(NH.getNode(), NH.getOffset()+SrcNH.getOffset());
-}
-
-void ReachabilityCloner::merge(const DSNodeHandle &NH,
-                               const DSNodeHandle &SrcNH) {
-  if (SrcNH.isNull()) return;  // Noop
-  if (NH.isNull()) {
-    // If there is no destination node, just clone the source and assign the
-    // destination node to be it.
-    NH.mergeWith(getClonedNH(SrcNH));
-    return;
-  }
-
-  // Okay, at this point, we know that we have both a destination and a source
-  // node that need to be merged.  Check to see if the source node has already
-  // been cloned.
-  const DSNode *SN = SrcNH.getNode();
-  DSNodeHandle &SCNH = NodeMap[SN];  // SourceClonedNodeHandle
-  if (!SCNH.isNull()) {   // Node already cloned?
-    DSNode *SCNHN = SCNH.getNode();
-    NH.mergeWith(DSNodeHandle(SCNHN,
-                              SCNH.getOffset()+SrcNH.getOffset()));
-    return;  // Nothing to do!
-  }
-
-  // Okay, so the source node has not already been cloned.  Instead of creating
-  // a new DSNode, only to merge it into the one we already have, try to perform
-  // the merge in-place.  The only case we cannot handle here is when the offset
-  // into the existing node is less than the offset into the virtual node we are
-  // merging in.  In this case, we have to extend the existing node, which
-  // requires an allocation anyway.
-  DSNode *DN = NH.getNode();   // Make sure the Offset is up-to-date
-  if (NH.getOffset() >= SrcNH.getOffset()) {
-    if (!DN->isNodeCompletelyFolded()) {
-      // Make sure the destination node is folded if the source node is folded.
-      if (SN->isNodeCompletelyFolded()) {
-        DN->foldNodeCompletely();
-        DN = NH.getNode();
-      } else if (SN->getSize() != DN->getSize()) {
-        // If the two nodes are of different size, and the smaller node has the
-        // array bit set, collapse!
-#if COLLAPSE_ARRAYS_AGGRESSIVELY
-        if (SN->getSize() < DN->getSize()) {
-          if (SN->isArray()) {
-            DN->foldNodeCompletely();
-            DN = NH.getNode();
-          }
-        } else if (DN->isArray()) {
-          DN->foldNodeCompletely();
-          DN = NH.getNode();
-        }
-#endif
-      }
-      if (DN->getSize() < SN->getSize())
-        DN->growSize(SN->getSize());
-
-      // Merge the type entries of the two nodes together...
-      if (!DN->isNodeCompletelyFolded())
-          DN->mergeTypeInfo(SN, NH.getOffset() - SrcNH.getOffset());
-
-    }
-
-    assert(!DN->isDeadNode());
-
-    // Merge the NodeType information.
-    DN->mergeNodeFlags(SN->getNodeFlags() & BitsToKeep);
-
-    // Before we start merging outgoing links and updating the scalar map, make
-    // sure it is known that this is the representative node for the src node.
-    SCNH = DSNodeHandle(DN, NH.getOffset()-SrcNH.getOffset());
-
-    // If the source node contains any globals, make sure they end up in the
-    // scalar map with the correct offset.
-    if (SN->globals_begin() != SN->globals_end()) {
-      // Update the globals in the destination node itself.
-      DN->mergeGlobals(*SN);
-
-      // Update the scalar map for the graph we are merging the source node
-      // into.
-      for (DSNode::globals_iterator I = SN->globals_begin(),
-             E = SN->globals_end(); I != E; ++I) {
-        const GlobalValue *GV = *I;
-        const DSNodeHandle &SrcGNH = Src->getNodeForValue(GV);
-        DSNodeHandle &DestGNH = NodeMap[SrcGNH.getNode()];
-        assert(DestGNH.getNode()==NH.getNode() &&"Global mapping inconsistent");
-        Dest->getNodeForValue(GV).mergeWith(DSNodeHandle(DestGNH.getNode(),
-                                      DestGNH.getOffset()+SrcGNH.getOffset()));
-      }
-      NH.getNode()->mergeGlobals(*SN);
-    }
-  } else {
-    // We cannot handle this case without allocating a temporary node.  Fall
-    // back on being simple.
-    DSNode *NewDN = new DSNode(*SN, Dest, true /* Null out all links */);
-    NewDN->maskNodeTypes(BitsToKeep);
-
-    unsigned NHOffset = NH.getOffset();
-    NH.mergeWith(DSNodeHandle(NewDN, SrcNH.getOffset()));
-
-    assert(NH.getNode() &&
-           (NH.getOffset() > NHOffset ||
-            (NH.getOffset() == 0 && NH.getNode()->isNodeCompletelyFolded())) &&
-           "Merging did not adjust the offset!");
-
-    // Before we start merging outgoing links and updating the scalar map, make
-    // sure it is known that this is the representative node for the src node.
-    SCNH = DSNodeHandle(NH.getNode(), NH.getOffset()-SrcNH.getOffset());
-
-    // If the source node contained any globals, make sure to create entries
-    // in the scalar map for them!
-    for (DSNode::globals_iterator I = SN->globals_begin(),
-           E = SN->globals_end(); I != E; ++I) {
-      const GlobalValue *GV = *I;
-      const DSNodeHandle &SrcGNH = Src->getNodeForValue(GV);
-      DSNodeHandle &DestGNH = NodeMap[SrcGNH.getNode()];
-      assert(DestGNH.getNode()==NH.getNode() &&"Global mapping inconsistent");
-      assert(SrcGNH.getNode() == SN && "Global mapping inconsistent");
-      Dest->getNodeForValue(GV).mergeWith(DSNodeHandle(DestGNH.getNode(),
-                                    DestGNH.getOffset()+SrcGNH.getOffset()));
-    }
-  }
-
-  //  DOUT << "LLVA: mergeWith: " << SN << " becomes " << DN << "\n";
-
-  // Next, recursively merge all outgoing links as necessary.  Note that
-  // adding these links can cause the destination node to collapse itself at
-  // any time, and the current node may be merged with arbitrary other nodes.
-  // For this reason, we must always go through NH.
-  DN = 0;
-  for (DSNode::const_edge_iterator ii = SN->edge_begin(), ee = SN->edge_end();
-       ii != ee; ++ii) {
-    const DSNodeHandle &SrcEdge = ii->second;
-    if (!SrcEdge.isNull()) {
-      // Compute the offset into the current node at which to
-      // merge this link.  In the common case, this is a linear
-      // relation to the offset in the original node (with
-      // wrapping), but if the current node gets collapsed due to
-      // recursive merging, we must make sure to merge in all remaining
-      // links at offset zero.
-      DSNode *CN = SCNH.getNode();
-      unsigned MergeOffset = (ii->first+SCNH.getOffset()) % CN->getSize();
-
-      DSNodeHandle Tmp = CN->getLink(MergeOffset);
-      if (!Tmp.isNull()) {
-        // Perform the recursive merging.  Make sure to create a temporary NH,
-        // because the Link can disappear in the process of recursive merging.
-        merge(Tmp, SrcEdge);
-      } else {
-        Tmp.mergeWith(getClonedNH(SrcEdge));
-        // Merging this could cause all kinds of recursive things to happen,
-        // culminating in the current node being eliminated.  Since this is
-        // possible, make sure to reaquire the link from 'CN'.
-
-        unsigned MergeOffset = 0;
-        CN = SCNH.getNode();
-        MergeOffset = (ii->first + SCNH.getOffset()) % CN->getSize();
-        CN->getLink(MergeOffset).mergeWith(Tmp);
-      }
-    }
-  }
 }
 
-/// mergeCallSite - Merge the nodes reachable from the specified src call
-/// site into the nodes reachable from DestCS.
-void ReachabilityCloner::mergeCallSite(DSCallSite &DestCS,
-                                       const DSCallSite &SrcCS) {
-  merge(DestCS.getRetVal(), SrcCS.getRetVal());
-  unsigned MinArgs = DestCS.getNumPtrArgs();
-  if (SrcCS.getNumPtrArgs() < MinArgs) MinArgs = SrcCS.getNumPtrArgs();
-
-  for (unsigned a = 0; a != MinArgs; ++a)
-    merge(DestCS.getPtrArg(a), SrcCS.getPtrArg(a));
-
-  for (unsigned a = MinArgs, e = SrcCS.getNumPtrArgs(); a != e; ++a)
-    DestCS.addPtrArg(getClonedNH(SrcCS.getPtrArg(a)));
-}
-
-DSCallSite ReachabilityCloner::cloneCallSite(const DSCallSite& SrcCS) {
-  std::vector<DSNodeHandle> Args;
-  for(unsigned x = 0; x < SrcCS.getNumPtrArgs(); ++x)
-    Args.push_back(getClonedNH(SrcCS.getPtrArg(x)));
-  if (SrcCS.isDirectCall())
-    return DSCallSite(SrcCS.getCallSite(),
-                      getClonedNH(SrcCS.getRetVal()),
-                      SrcCS.getCalleeFunc(),
-                      Args);
-  else
-    return DSCallSite(SrcCS.getCallSite(),
-                      getClonedNH(SrcCS.getRetVal()),
-                      getClonedNH(SrcCS.getCalleeNode()).getNode(),
-                      Args);
-}
-
-//===----------------------------------------------------------------------===//
-// DSCallSite Implementation
-//===----------------------------------------------------------------------===//
-
-// Define here to avoid including iOther.h and BasicBlock.h in DSGraph.h
-const Function &DSCallSite::getCaller() const {
-  return *Site.getInstruction()->getParent()->getParent();
-}
-
-void DSCallSite::InitNH(DSNodeHandle &NH, const DSNodeHandle &Src,
-                        ReachabilityCloner &RC) {
-  NH = RC.getClonedNH(Src);
-}
-
-//===----------------------------------------------------------------------===//
-// DSGraph Implementation
-//===----------------------------------------------------------------------===//
-
 /// getFunctionNames - Return a space separated list of the name of the
 /// functions in this graph (if any)
 std::string DSGraph::getFunctionNames() const {
@@ -840,22 +87,6 @@
 // dump - Allow inspection of graph in a debugger.
 void DSGraph::dump() const { print(errs()); }
 
-
-/// remapLinks - Change all of the Links in the current node according to the
-/// specified mapping.
-///
-void DSNode::remapLinks(DSGraph::NodeMapTy &OldNodeMap) {
-  for (LinkMapTy::iterator ii = edge_begin(), ee = edge_end();
-       ii != ee; ++ii)
-    if (DSNode *N = ii->second.getNode()) {
-      DSGraph::NodeMapTy::const_iterator ONMI = OldNodeMap.find(N);
-      if (ONMI != OldNodeMap.end()) {
-        DSNode *ONMIN = ONMI->second.getNode();
-        ii->second.setTo(ONMIN, ii->second.getOffset()+ONMI->second.getOffset());
-      }
-    }
-}
-
 void DSGraph::removeFunctionCalls(Function& F) {
   for (std::list<DSCallSite>::iterator I = FunctionCalls.begin(),
          E = FunctionCalls.end(); I != E; ++I)
@@ -999,23 +230,6 @@
   ScalarMap.spliceFrom(RHS->ScalarMap);
 }
 
-/// spliceFrom - Copy all entries from RHS, then clear RHS.
-///
-void DSScalarMap::spliceFrom(DSScalarMap &RHS) {
-  // Special case if this is empty.
-  if (ValueMap.empty()) {
-    ValueMap.swap(RHS.ValueMap);
-    GlobalSet.swap(RHS.GlobalSet);
-  } else {
-    GlobalSet.insert(RHS.GlobalSet.begin(), RHS.GlobalSet.end());
-    for (ValueMapTy::iterator I = RHS.ValueMap.begin(), E = RHS.ValueMap.end();
-         I != E; ++I)
-      ValueMap[I->first].mergeWith(I->second);
-    RHS.ValueMap.clear();
-  }
-}
-
-
 /// getFunctionArgumentsForCall - Given a function that is currently in this
 /// graph, return the DSNodeHandles that correspond to the pointer-compatible
 /// function arguments.  The vector is filled in with the return value (or
@@ -1381,7 +595,7 @@
     if (N->getNumReferrers() == 1)  // Does it point to a lonely node?
       // No interesting info?
       if ((N->getNodeFlags() & ~DSNode::IncompleteNode) == 0
-          && N->type_begin() == N->type_end()
+          && N->hasNoType()
           && !N->isNodeCompletelyFolded())
         Edge.setTo(0, 0);  // Kill the edge!
 }
@@ -1549,11 +763,13 @@
 
   // Loop over all of the nodes in the graph, calling getNode on each field.
   // This will cause all nodes to update their forwarding edges, causing
-  // forwarded nodes to be delete-able.
+  // forwarded nodes to be delete-able.  Further, reclaim any memory used by
+  // useless edge or type entries
   for (node_iterator NI = node_begin(), E = node_end(); NI != E; ++NI)
     for (DSNode::edge_iterator ii = NI->edge_begin(), ee = NI->edge_end();
-         ii != ee; ++ii)
-      ii->second.getNode();
+         ii != ee; ++ii) {
+      ii->second.getNode()->cleanEdges();
+    }
 
   // Likewise, forward any edges from the scalar nodes.  While we are at it,
   // clean house a bit.
@@ -1616,28 +832,6 @@
   removeIdenticalCalls(AuxFunctionCalls);
 }
 
-
-/// markReachableNodes - This method recursively traverses the specified
-/// DSNodes, marking any nodes which are reachable.  All reachable nodes it adds
-/// to the set, which allows it to only traverse visited nodes once.
-///
-void DSNode::markReachableNodes(DenseSet<const DSNode*> &ReachableNodes) const {
-  if (this == 0) return;
-  assert(!isForwarding() && "Cannot mark a forwarded node!");
-  if (ReachableNodes.insert(this).second) // Is newly reachable?
-    for (DSNode::const_edge_iterator I = edge_begin(), E = edge_end();
-         I != E; ++I)
-      I->second.getNode()->markReachableNodes(ReachableNodes);
-}
-
-void DSCallSite::markReachableNodes(DenseSet<const DSNode*> &Nodes) const {
-  getRetVal().getNode()->markReachableNodes(Nodes);
-  if (isIndirectCall()) getCalleeNode()->markReachableNodes(Nodes);
-
-  for (unsigned i = 0, e = getNumPtrArgs(); i != e; ++i)
-    getPtrArg(i).getNode()->markReachableNodes(Nodes);
-}
-
 // CanReachAliveNodes - Simple graph walker that recursively traverses the graph
 // looking for a node that is marked alive.  If an alive node is found, return
 // true, otherwise return false.  If an alive node is reachable, this node is
@@ -2023,248 +1217,3 @@
 }
 
 
-////////////////////////////////////////////////////////////////////////////////
-//Base DataStructures impl:
-////////////////////////////////////////////////////////////////////////////////
-
-static const Function *getFnForValue(const Value *V) {
-  if (const Instruction *I = dyn_cast<Instruction>(V))
-    return I->getParent()->getParent();
-  else if (const Argument *A = dyn_cast<Argument>(V))
-    return A->getParent();
-  else if (const BasicBlock *BB = dyn_cast<BasicBlock>(V))
-    return BB->getParent();
-  return 0;
-}
-
-/// deleteValue/copyValue - Interfaces to update the DSGraphs in the program.
-/// These correspond to the interfaces defined in the AliasAnalysis class.
-void DataStructures::deleteValue(Value *V) {
-  if (const Function *F = getFnForValue(V)) {  // Function local value?
-    // If this is a function local value, just delete it from the scalar map!
-    getDSGraph(*F)->getScalarMap().eraseIfExists(V);
-    return;
-  }
-  
-  if (Function *F = dyn_cast<Function>(V)) {
-    assert(getDSGraph(*F)->getReturnNodes().size() == 1 &&
-           "cannot handle scc's");
-    delete DSInfo[F];
-    DSInfo.erase(F);
-    return;
-  }
-  
-  assert(!isa<GlobalVariable>(V) && "Do not know how to delete GV's yet!");
-}
-
-void DataStructures::copyValue(Value *From, Value *To) {
-  if (From == To) return;
-  if (const Function *F = getFnForValue(From)) {  // Function local value?
-    // If this is a function local value, just delete it from the scalar map!
-    getDSGraph(*F)->getScalarMap().copyScalarIfExists(From, To);
-    return;
-  }
-  
-  if (Function *FromF = dyn_cast<Function>(From)) {
-    Function *ToF = cast<Function>(To);
-    assert(!DSInfo.count(ToF) && "New Function already exists!");
-    DSGraph *NG = new DSGraph(getDSGraph(*FromF), GlobalECs, *TypeSS);
-    DSInfo[ToF] = NG;
-    assert(NG->getReturnNodes().size() == 1 && "Cannot copy SCC's yet!");
-    
-    // Change the Function* is the returnnodes map to the ToF.
-    DSNodeHandle Ret = NG->retnodes_begin()->second;
-    NG->getReturnNodes().clear();
-    NG->getReturnNodes()[ToF] = Ret;
-    return;
-  }
-  
-  if (const Function *F = getFnForValue(To)) {
-    getDSGraph(*F)->getScalarMap().copyScalarIfExists(From, To);
-    return;
-  }
-  
-  errs() << *From;
-  errs() << *To;
-  assert(0 && "Do not know how to copy this yet!");
-  abort();
-}
-
-DSGraph* DataStructures::getOrCreateGraph(const Function* F) {
-  assert(F && "No function");
-  DSGraph *&G = DSInfo[F];
-  if (!G) {
-    //Clone or Steal the Source Graph
-    DSGraph* BaseGraph = GraphSource->getDSGraph(*F);
-    if (Clone) {
-      G = new DSGraph(BaseGraph, GlobalECs, *TypeSS, DSGraph::DontCloneAuxCallNodes);
-    } else {
-      G = new DSGraph(GlobalECs, GraphSource->getTargetData(), *TypeSS);
-      G->spliceFrom(BaseGraph);
-      if (resetAuxCalls) 
-        G->getAuxFunctionCalls() = G->getFunctionCalls();
-    }
-    G->setPrintAuxCalls();
-    G->setGlobalsGraph(GlobalsGraph);
-    
-    // Note that this graph is the graph for ALL of the function in the SCC, not
-    // just F.
-    for (DSGraph::retnodes_iterator RI = G->retnodes_begin(),
-           E = G->retnodes_end(); RI != E; ++RI)
-      if (RI->first != F)
-        DSInfo[RI->first] = G;
-  }
-  return G;
-}
-
-
-void DataStructures::formGlobalECs() {
-  // Grow the equivalence classes for the globals to include anything that we
-  // now know to be aliased.
-  sv::set<const GlobalValue*> ECGlobals;
-  buildGlobalECs(ECGlobals);
-  if (!ECGlobals.empty()) {
-    DEBUG(errs() << "Eliminating " << ECGlobals.size() << " EC Globals!\n");
-    for (DSInfoTy::iterator I = DSInfo.begin(),
-           E = DSInfo.end(); I != E; ++I)
-      eliminateUsesOfECGlobals(*I->second, ECGlobals);
-  }
-}
-
-/// BuildGlobalECs - Look at all of the nodes in the globals graph.  If any node
-/// contains multiple globals, DSA will never, ever, be able to tell the globals
-/// apart.  Instead of maintaining this information in all of the graphs
-/// throughout the entire program, store only a single global (the "leader") in
-/// the graphs, and build equivalence classes for the rest of the globals.
-void DataStructures::buildGlobalECs(sv::set<const GlobalValue*> &ECGlobals) {
-  DSScalarMap &SM = GlobalsGraph->getScalarMap();
-  EquivalenceClasses<const GlobalValue*> &GlobalECs = SM.getGlobalECs();
-  for (DSGraph::node_iterator I = GlobalsGraph->node_begin(), 
-         E = GlobalsGraph->node_end();
-       I != E; ++I) {
-    if (I->numGlobals() <= 1) continue;
-
-    // First, build up the equivalence set for this block of globals.
-    DSNode::globals_iterator i = I->globals_begin(); 
-    const GlobalValue *First = *i;
-    if (GlobalECs.findValue(*i) != GlobalECs.end())
-      First = GlobalECs.getLeaderValue(*i);
-    if (*i == First) ++i;
-    for( ; i != I->globals_end(); ++i) {
-      GlobalECs.unionSets(First, *i);
-      ECGlobals.insert(*i);
-      if (SM.find(*i) != SM.end())
-        SM.erase(SM.find(*i));
-      else
-        errs() << "Global missing in scalar map " << (*i)->getName() << "\n";
-    }
-
-    // Next, get the leader element.
-    assert(First == GlobalECs.getLeaderValue(First) &&
-           "First did not end up being the leader?");
-
-    // Finally, change the global node to only contain the leader.
-    I->clearGlobals();
-    I->addGlobal(First);
-  }
-
-  DEBUG(GlobalsGraph->AssertGraphOK());
-}
-
-/// EliminateUsesOfECGlobals - Once we have determined that some globals are in
-/// really just equivalent to some other globals, remove the globals from the
-/// specified DSGraph (if present), and merge any nodes with their leader nodes.
-void DataStructures::eliminateUsesOfECGlobals(DSGraph &G,
-                                              const sv::set<const GlobalValue*> &ECGlobals) {
-  DSScalarMap &SM = G.getScalarMap();
-  EquivalenceClasses<const GlobalValue*> &GlobalECs = SM.getGlobalECs();
-
-  bool MadeChange = false;
-  std::vector<const GlobalValue*> SMGVV(SM.global_begin(), SM.global_end());
-
-  for (std::vector<const GlobalValue*>::iterator GI = SMGVV.begin(),
-       E = SMGVV.end(); GI != E; ) {
-    const GlobalValue *GV = *GI; ++GI;
-    if (!ECGlobals.count(GV)) continue;
-
-    const DSNodeHandle &GVNH = SM[GV];
-    assert(!GVNH.isNull() && "Global has null NH!?");
-
-    // Okay, this global is in some equivalence class.  Start by finding the
-    // leader of the class.
-    const GlobalValue *Leader = GlobalECs.getLeaderValue(GV);
-
-    // If the leader isn't already in the graph, insert it into the node
-    // corresponding to GV.
-    if (!SM.global_count(Leader)) {
-      GVNH.getNode()->addGlobal(Leader);
-      SM[Leader] = GVNH;
-    } else {
-      // Otherwise, the leader is in the graph, make sure the nodes are the
-      // merged in the specified graph.
-      const DSNodeHandle &LNH = SM[Leader];
-      if (LNH.getNode() != GVNH.getNode())
-        LNH.mergeWith(GVNH);
-    }
-
-    // Next step, remove the global from the DSNode.
-    GVNH.getNode()->removeGlobal(GV);
-
-    // Finally, remove the global from the ScalarMap.
-    SM.erase(GV);
-    MadeChange = true;
-  }
-
-  DEBUG(if(MadeChange) G.AssertGraphOK());
-}
-
-void DataStructures::init(DataStructures* D, bool clone, bool printAuxCalls, 
-                          bool copyGlobalAuxCalls, bool resetAux) {
-  assert (!GraphSource && "Already init");
-  GraphSource = D;
-  Clone = clone;
-  resetAuxCalls = resetAux;
-  TD = D->TD;
-  TypeSS = D->TypeSS;
-  ActualCallees = D->ActualCallees;
-  GlobalECs = D->getGlobalECs();
-  GlobalsGraph = new DSGraph(D->getGlobalsGraph(), GlobalECs, *TypeSS,
-                             copyGlobalAuxCalls?0:DSGraph::DontCloneAuxCallNodes);
-  if (printAuxCalls) GlobalsGraph->setPrintAuxCalls();
-
-  //
-  // Tell the other DSA pass if we're stealing its graph.
-  //
-  if (!clone) D->DSGraphsStolen = true;
-}
-
-void DataStructures::init(TargetData* T) {
-  assert (!TD && "Already init");
-  GraphSource = 0;
-  Clone = false;
-  TD = T;
-  TypeSS = new SuperSet<const Type*>();
-  GlobalsGraph = new DSGraph(GlobalECs, *T, *TypeSS);
-}
-
-void DataStructures::releaseMemory() {
-  //
-  // If the DSGraphs were stolen by another pass, free nothing.
-  //
-  if (DSGraphsStolen) return;
-
-  std::set<DSGraph*> toDelete;
-  for (DSInfoTy::iterator I = DSInfo.begin(), E = DSInfo.end(); I != E; ++I) {
-    I->second->getReturnNodes().clear();
-    toDelete.insert(I->second);
-  }
-  for (std::set<DSGraph*>::iterator I = toDelete.begin(), E = toDelete.end(); I != E; ++I)
-    delete *I;
-
-  // Empty map so next time memory is released, data structures are not
-  // re-deleted.
-  DSInfo.clear();
-  ActualCallees.clear();
-  delete GlobalsGraph;
-  GlobalsGraph = 0;
-}

Modified: poolalloc/trunk/lib/DSA/DataStructure.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DataStructure.cpp?rev=98315&r1=98314&r2=98315&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/DataStructure.cpp (original)
+++ poolalloc/trunk/lib/DSA/DataStructure.cpp Thu Mar 11 18:16:41 2010
@@ -39,15 +39,8 @@
 #define COLLAPSE_ARRAYS_AGGRESSIVELY 0
 namespace {
   STATISTIC (NumFolds, "Number of nodes completely folded");
-  STATISTIC (NumCallNodesMerged, "Number of call nodes merged");
   STATISTIC (NumNodeAllocated  , "Number of nodes allocated");
-  STATISTIC (NumDNE            , "Number of nodes removed by reachability");
-  STATISTIC (NumTrivialDNE     , "Number of nodes trivially removed");
-  STATISTIC (NumTrivialGlobalDNE, "Number of globals trivially removed");
   static cl::opt<unsigned>
-  DSAFieldLimit("dsa-field-limit", cl::Hidden,
-                cl::desc("Number of fields to track before collapsing a node"),
-                cl::init(256));
 }
 
 /// isForwarding - Return true if this NodeHandle is forwarding to another
@@ -115,6 +108,22 @@
   return ValueMap.insert(std::make_pair(GV, DSNodeHandle())).first->second;
 }
 
+/// spliceFrom - Copy all entries from RHS, then clear RHS.
+///
+void DSScalarMap::spliceFrom(DSScalarMap &RHS) {
+  // Special case if this is empty.
+  if (ValueMap.empty()) {
+    ValueMap.swap(RHS.ValueMap);
+    GlobalSet.swap(RHS.GlobalSet);
+  } else {
+    GlobalSet.insert(RHS.GlobalSet.begin(), RHS.GlobalSet.end());
+    for (ValueMapTy::iterator I = RHS.ValueMap.begin(), E = RHS.ValueMap.end();
+         I != E; ++I)
+      ValueMap[I->first].mergeWith(I->second);
+    RHS.ValueMap.clear();
+  }
+}
+
 //===----------------------------------------------------------------------===//
 // DSNode Implementation
 //===----------------------------------------------------------------------===//
@@ -315,6 +324,7 @@
   if (Offset >= getSize()) growSize(Offset+1);
 
   TyMap[Offset] = getParentGraph()->getTypeSS().getOrCreate(TyMap[Offset], NewTy);
+  assert(TyMap[Offset]);
 }
 
 void DSNode::mergeTypeInfo(const TyMapTy::mapped_type TyIt, unsigned Offset) {
@@ -331,6 +341,7 @@
     S.insert(TyIt->begin(), TyIt->end());
     TyMap[Offset] = getParentGraph()->getTypeSS().getOrCreate(S);
   }
+  assert(TyMap[Offset]);
 }
 
 void DSNode::mergeTypeInfo(const DSNode* DN, unsigned Offset) {
@@ -510,6 +521,29 @@
     DSNode::MergeNodes(NHCopy, CurNodeH);
 }
 
+void DSNode::cleanEdges() {
+  //get rid of any type edge pointing to the null type
+  for (type_iterator ii = type_begin(); ii != type_end(); ) {
+    if (ii->second)
+      ++ii;
+    else {
+      type_iterator backup = ii;
+      ++backup;
+      TyMap.erase(ii);
+      ii = backup;
+    }
+  }
+  //get rid of any node edge pointing to nothing
+  for (edge_iterator ii = edge_begin(); ii != edge_end(); ) {
+    if (ii->second.isNull()) {
+      edge_iterator backup = ii;
+      ++backup;
+      Links.erase(ii);
+      ii = backup;
+    } else
+      ++ii;
+  }
+}
 
 //===----------------------------------------------------------------------===//
 // ReachabilityCloner Implementation
@@ -794,53 +828,6 @@
   NH = RC.getClonedNH(Src);
 }
 
-//===----------------------------------------------------------------------===//
-// DSGraph Implementation
-//===----------------------------------------------------------------------===//
-
-/// getFunctionNames - Return a space separated list of the name of the
-/// functions in this graph (if any)
-std::string DSGraph::getFunctionNames() const {
-  switch (getReturnNodes().size()) {
-  case 0: return "Globals graph";
-  case 1: return retnodes_begin()->first->getName();
-  default:
-    std::string Return;
-    for (DSGraph::retnodes_iterator I = retnodes_begin();
-         I != retnodes_end(); ++I)
-      Return += I->first->getNameStr() + " ";
-    Return.erase(Return.end()-1, Return.end());   // Remove last space character
-    return Return;
-  }
-}
-
-
-DSGraph::DSGraph(DSGraph* G, EquivalenceClasses<const GlobalValue*> &ECs,
-                 SuperSet<const Type*>& tss,
-                 unsigned CloneFlags)
-  : GlobalsGraph(0), ScalarMap(ECs), TD(G->TD), TypeSS(tss) {
-  PrintAuxCalls = false;
-  cloneInto(G, CloneFlags);
-}
-
-DSGraph::~DSGraph() {
-  FunctionCalls.clear();
-  AuxFunctionCalls.clear();
-  ScalarMap.clear();
-  ReturnNodes.clear();
-
-  // Drop all intra-node references, so that assertions don't fail...
-  for (node_iterator NI = node_begin(), E = node_end(); NI != E; ++NI)
-    NI->dropAllReferences();
-
-  // Free all of the nodes.
-  Nodes.clear();
-}
-
-// dump - Allow inspection of graph in a debugger.
-void DSGraph::dump() const { print(errs()); }
-
-
 /// remapLinks - Change all of the Links in the current node according to the
 /// specified mapping.
 ///
@@ -856,182 +843,6 @@
     }
 }
 
-void DSGraph::removeFunctionCalls(Function& F) {
-  for (std::list<DSCallSite>::iterator I = FunctionCalls.begin(),
-         E = FunctionCalls.end(); I != E; ++I)
-    if (I->isDirectCall() && I->getCalleeFunc() == &F) {
-      FunctionCalls.erase(I);
-      break;
-    }
-
-  for (std::list<DSCallSite>::iterator I = AuxFunctionCalls.begin(),
-         E = AuxFunctionCalls.end(); I != E; ++I)
-    if (I->isDirectCall() && I->getCalleeFunc() == &F) {
-      AuxFunctionCalls.erase(I);
-      break;
-    }
-}
-
-/// addObjectToGraph - This method can be used to add global, stack, and heap
-/// objects to the graph.  This can be used when updating DSGraphs due to the
-/// introduction of new temporary objects.  The new object is not pointed to
-/// and does not point to any other objects in the graph.
-DSNode *DSGraph::addObjectToGraph(Value *Ptr, bool UseDeclaredType) {
-  assert(isa<PointerType>(Ptr->getType()) && "Ptr is not a pointer!");
-  DSNode *N = new DSNode(this);
-  assert(ScalarMap[Ptr].isNull() && "Object already in this graph!");
-  ScalarMap[Ptr] = N;
-
-  if (GlobalValue *GV = dyn_cast<GlobalValue>(Ptr)) {
-    N->addGlobal(GV);
-//  } else if (isa<MallocInst>(Ptr)) {
-//   N->setHeapMarker();
-  } else if (isa<AllocaInst>(Ptr)) {
-    N->setAllocaMarker();
-  } else {
-    assert(0 && "Illegal memory object input!");
-  }
-  return N;
-}
-
-
-/// cloneInto - Clone the specified DSGraph into the current graph.  The
-/// translated ScalarMap for the old function is filled into the ScalarMap
-/// for the graph, and the translated ReturnNodes map is returned into
-/// ReturnNodes.
-///
-/// The CloneFlags member controls various aspects of the cloning process.
-///
-void DSGraph::cloneInto( DSGraph* G, unsigned CloneFlags) {
-  assert(G != this && "Cannot clone graph into itself!");
-
-  NodeMapTy OldNodeMap;
-
-  // Remove alloca or mod/ref bits as specified...
-  unsigned BitsToClear = ((CloneFlags & StripAllocaBit)? DSNode::AllocaNode : 0)
-    | ((CloneFlags & StripModRefBits)? (DSNode::ModifiedNode | DSNode::ReadNode) : 0)
-    | ((CloneFlags & StripIncompleteBit)? DSNode::IncompleteNode : 0);
-  BitsToClear |= DSNode::DeadNode;  // Clear dead flag...
-
-  for (node_const_iterator I = G->node_begin(), E = G->node_end(); I != E; ++I) {
-    assert(!I->isForwarding() &&
-           "Forward nodes shouldn't be in node list!");
-    DSNode *New = new DSNode(*I, this);
-    New->maskNodeTypes(~BitsToClear);
-    OldNodeMap[I] = New;
-  }
-
-#ifndef NDEBUG
-  Timer::addPeakMemoryMeasurement();
-#endif
-
-  // Rewrite the links in the new nodes to point into the current graph now.
-  // Note that we don't loop over the node's list to do this.  The problem is
-  // that remaping links can cause recursive merging to happen, which means
-  // that node_iterator's can get easily invalidated!  Because of this, we
-  // loop over the OldNodeMap, which contains all of the new nodes as the
-  // .second element of the map elements.  Also note that if we remap a node
-  // more than once, we won't break anything.
-  for (NodeMapTy::iterator I = OldNodeMap.begin(), E = OldNodeMap.end();
-       I != E; ++I)
-    I->second.getNode()->remapLinks(OldNodeMap);
-
-  // Copy the scalar map... merging all of the global nodes...
-  for (DSScalarMap::const_iterator I = G->ScalarMap.begin(),
-         E = G->ScalarMap.end(); I != E; ++I) {
-    DSNodeHandle &MappedNode = OldNodeMap[I->second.getNode()];
-    DSNodeHandle &H = ScalarMap.getRawEntryRef(I->first);
-    DSNode *MappedNodeN = MappedNode.getNode();
-    H.mergeWith(DSNodeHandle(MappedNodeN,
-                             I->second.getOffset()+MappedNode.getOffset()));
-  }
-
-  if (!(CloneFlags & DontCloneCallNodes)) {
-    // Copy the function calls list.
-    for (fc_iterator I = G->fc_begin(), E = G->fc_end(); I != E; ++I)
-      FunctionCalls.push_back(DSCallSite(*I, OldNodeMap));
-  }
-
-  if (!(CloneFlags & DontCloneAuxCallNodes)) {
-    // Copy the auxiliary function calls list.
-    for (afc_iterator I = G->afc_begin(), E = G->afc_end(); I != E; ++I)
-      AuxFunctionCalls.push_back(DSCallSite(*I, OldNodeMap));
-  }
-
-  // Map the return node pointers over...
-  for (retnodes_iterator I = G->retnodes_begin(),
-         E = G->retnodes_end(); I != E; ++I) {
-    const DSNodeHandle &Ret = I->second;
-    DSNodeHandle &MappedRet = OldNodeMap[Ret.getNode()];
-    DSNode *MappedRetN = MappedRet.getNode();
-    ReturnNodes.insert(std::make_pair(I->first,
-                                      DSNodeHandle(MappedRetN,
-                                     MappedRet.getOffset()+Ret.getOffset())));
-  }
-}
-
-/// spliceFrom - Logically perform the operation of cloning the RHS graph into
-/// this graph, then clearing the RHS graph.  Instead of performing this as
-/// two seperate operations, do it as a single, much faster, one.
-///
-void DSGraph::spliceFrom(DSGraph* RHS) {
-  assert(this != RHS && "Splicing self");
-  // Change all of the nodes in RHS to think we are their parent.
-  for (NodeListTy::iterator I = RHS->Nodes.begin(), E = RHS->Nodes.end();
-       I != E; ++I)
-    I->setParentGraph(this);
-  // Take all of the nodes.
-  Nodes.splice(Nodes.end(), RHS->Nodes);
-
-  // Take all of the calls.
-  FunctionCalls.splice(FunctionCalls.end(), RHS->FunctionCalls);
-  AuxFunctionCalls.splice(AuxFunctionCalls.end(), RHS->AuxFunctionCalls);
-
-  // Take all of the return nodes.
-  if (ReturnNodes.empty()) {
-    ReturnNodes.swap(RHS->ReturnNodes);
-  } else {
-    ReturnNodes.insert(RHS->ReturnNodes.begin(), RHS->ReturnNodes.end());
-    RHS->ReturnNodes.clear();
-  }
-
- // Merge the scalar map in.
-  ScalarMap.spliceFrom(RHS->ScalarMap);
-}
-
-/// spliceFrom - Copy all entries from RHS, then clear RHS.
-///
-void DSScalarMap::spliceFrom(DSScalarMap &RHS) {
-  // Special case if this is empty.
-  if (ValueMap.empty()) {
-    ValueMap.swap(RHS.ValueMap);
-    GlobalSet.swap(RHS.GlobalSet);
-  } else {
-    GlobalSet.insert(RHS.GlobalSet.begin(), RHS.GlobalSet.end());
-    for (ValueMapTy::iterator I = RHS.ValueMap.begin(), E = RHS.ValueMap.end();
-         I != E; ++I)
-      ValueMap[I->first].mergeWith(I->second);
-    RHS.ValueMap.clear();
-  }
-}
-
-
-/// getFunctionArgumentsForCall - Given a function that is currently in this
-/// graph, return the DSNodeHandles that correspond to the pointer-compatible
-/// function arguments.  The vector is filled in with the return value (or
-/// null if it is not pointer compatible), followed by all of the
-/// pointer-compatible arguments.
-void DSGraph::getFunctionArgumentsForCall(const Function *F,
-                                       std::vector<DSNodeHandle> &Args) const {
-  Args.push_back(getReturnNodeFor(*F));
-  for (Function::const_arg_iterator AI = F->arg_begin(), E = F->arg_end();
-       AI != E; ++AI)
-    if (isa<PointerType>(AI->getType())) {
-      Args.push_back(getNodeForValue(AI));
-      assert(!Args.back().isNull() && "Pointer argument w/o scalarmap entry!?");
-    }
-}
-
 namespace {
   // HackedGraphSCCFinder - This is used to find nodes that have a path from the
   // node to a node cloned by the ReachabilityCloner object contained.  To be
@@ -1139,484 +950,6 @@
   return ThisNodeInfo;
 }
 
-/// mergeInCallFromOtherGraph - This graph merges in the minimal number of
-/// nodes from G2 into 'this' graph, merging the bindings specified by the
-/// call site (in this graph) with the bindings specified by the vector in G2.
-/// The two DSGraphs must be different.
-///
-void DSGraph::mergeInGraph(const DSCallSite &CS,
-                           std::vector<DSNodeHandle> &Args,
-                           const DSGraph &Graph, unsigned CloneFlags) {
-  assert((CloneFlags & DontCloneCallNodes) &&
-         "Doesn't support copying of call nodes!");
-
-  // If this is not a recursive call, clone the graph into this graph...
-  if (&Graph == this) {
-    // Merge the return value with the return value of the context.
-    Args[0].mergeWith(CS.getRetVal());
-
-    // Resolve all of the function arguments.
-    for (unsigned i = 0, e = CS.getNumPtrArgs(); i != e; ++i) {
-      if (i == Args.size()-1)
-        break;
-
-      // Add the link from the argument scalar to the provided value.
-      Args[i+1].mergeWith(CS.getPtrArg(i));
-    }
-    return;
-  }
-
-  // Clone the callee's graph into the current graph, keeping track of where
-  // scalars in the old graph _used_ to point, and of the new nodes matching
-  // nodes of the old graph.
-  ReachabilityCloner RC(this, &Graph, CloneFlags);
-
-  // Map the return node pointer over.
-  if (!CS.getRetVal().isNull())
-    RC.merge(CS.getRetVal(), Args[0]);
-
-  // Map over all of the arguments.
-  for (unsigned i = 0, e = CS.getNumPtrArgs(); i != e; ++i) {
-    if (i == Args.size()-1)
-      break;
-
-    // Add the link from the argument scalar to the provided value.
-    RC.merge(CS.getPtrArg(i), Args[i+1]);
-  }
-
-  // We generally don't want to copy global nodes or aux calls from the callee
-  // graph to the caller graph.  However, we have to copy them if there is a
-  // path from the node to a node we have already copied which does not go
-  // through another global.  Compute the set of node that can reach globals and
-  // aux call nodes to copy over, then do it.
-  std::vector<const DSCallSite*> AuxCallToCopy;
-  std::vector<const GlobalValue*> GlobalsToCopy;
-
-  // NodesReachCopiedNodes - Memoize results for efficiency.  Contains a
-  // true/false value for every visited node that reaches a copied node without
-  // going through a global.
-  HackedGraphSCCFinder SCCFinder(RC);
-
-  if (!(CloneFlags & DontCloneAuxCallNodes))
-    for (afc_const_iterator I = Graph.afc_begin(), E = Graph.afc_end(); I!=E; ++I)
-      if (SCCFinder.PathExistsToClonedNode(*I))
-        AuxCallToCopy.push_back(&*I);
-//       else if (I->isIndirectCall()){
-//  	//If the call node doesn't have any callees, clone it
-//  	std::vector< Function *> List;
-//  	I->getCalleeNode()->addFullFunctionList(List);
-//  	if (!List.size())
-//  	  AuxCallToCopy.push_back(&*I);
-//        }
-
-  const DSScalarMap &GSM = Graph.getScalarMap();
-  for (DSScalarMap::global_iterator GI = GSM.global_begin(),
-         E = GSM.global_end(); GI != E; ++GI) {
-    DSNode *GlobalNode = Graph.getNodeForValue(*GI).getNode();
-    for (DSNode::edge_iterator EI = GlobalNode->edge_begin(),
-           EE = GlobalNode->edge_end(); EI != EE; ++EI)
-      if (SCCFinder.PathExistsToClonedNode(EI->second.getNode())) {
-        GlobalsToCopy.push_back(*GI);
-        break;
-      }
-  }
-
-  // Copy aux calls that are needed.
-  for (unsigned i = 0, e = AuxCallToCopy.size(); i != e; ++i)
-    AuxFunctionCalls.push_back(DSCallSite(*AuxCallToCopy[i], RC));
-
-  // Copy globals that are needed.
-  for (unsigned i = 0, e = GlobalsToCopy.size(); i != e; ++i)
-    RC.getClonedNH(Graph.getNodeForValue(GlobalsToCopy[i]));
-}
-
-
-
-/// mergeInGraph - The method is used for merging graphs together.  If the
-/// argument graph is not *this, it makes a clone of the specified graph, then
-/// merges the nodes specified in the call site with the formal arguments in the
-/// graph.
-///
-void DSGraph::mergeInGraph(const DSCallSite &CS, const Function &F,
-                           const DSGraph &Graph, unsigned CloneFlags) {
-  // Set up argument bindings.
-  std::vector<DSNodeHandle> Args;
-  Graph.getFunctionArgumentsForCall(&F, Args);
-
-  mergeInGraph(CS, Args, Graph, CloneFlags);
-}
-
-/// getCallSiteForArguments - Get the arguments and return value bindings for
-/// the specified function in the current graph.
-///
-DSCallSite DSGraph::getCallSiteForArguments(const Function &F) const {
-  std::vector<DSNodeHandle> Args;
-
-  for (Function::const_arg_iterator I = F.arg_begin(), E = F.arg_end(); I != E; ++I)
-    if (isa<PointerType>(I->getType()))
-      Args.push_back(getNodeForValue(I));
-
-  return DSCallSite(CallSite(), getReturnNodeFor(F), &F, Args);
-}
-
-/// getDSCallSiteForCallSite - Given an LLVM CallSite object that is live in
-/// the context of this graph, return the DSCallSite for it.
-DSCallSite DSGraph::getDSCallSiteForCallSite(CallSite CS) const {
-  DSNodeHandle RetVal;
-  Instruction *I = CS.getInstruction();
-  if (isa<PointerType>(I->getType()))
-    RetVal = getNodeForValue(I);
-
-  std::vector<DSNodeHandle> Args;
-  Args.reserve(CS.arg_end()-CS.arg_begin());
-
-  // Calculate the arguments vector...
-  for (CallSite::arg_iterator I = CS.arg_begin(), E = CS.arg_end(); I != E; ++I)
-    if (isa<PointerType>((*I)->getType())) {
-      if (isa<ConstantPointerNull>(*I))
-        Args.push_back(DSNodeHandle());
-      else
-        Args.push_back(getNodeForValue(*I));
-    }
-
-  // Add a new function call entry...
-  if (Function *F = CS.getCalledFunction())
-    return DSCallSite(CS, RetVal, F, Args);
-  else
-    return DSCallSite(CS, RetVal,
-                      getNodeForValue(CS.getCalledValue()).getNode(), Args);
-}
-
-
-
-// markIncompleteNodes - Mark the specified node as having contents that are not
-// known with the current analysis we have performed.  Because a node makes all
-// of the nodes it can reach incomplete if the node itself is incomplete, we
-// must recursively traverse the data structure graph, marking all reachable
-// nodes as incomplete.
-//
-static void markIncompleteNode(DSNode *N) {
-  // Stop recursion if no node, or if node already marked...
-  if (N == 0 || N->isIncompleteNode()) return;
-
-  // Actually mark the node
-  N->setIncompleteMarker();
-
-  // Recursively process children...
-  for (DSNode::edge_iterator ii = N->edge_begin(), ee = N->edge_end();
-       ii != ee; ++ii)
-    markIncompleteNode(ii->second.getNode());
-}
-
-static void markIncomplete(DSCallSite &Call) {
-  // Then the return value is certainly incomplete!
-  markIncompleteNode(Call.getRetVal().getNode());
-
-  // All objects pointed to by function arguments are incomplete!
-  for (unsigned i = 0, e = Call.getNumPtrArgs(); i != e; ++i)
-    markIncompleteNode(Call.getPtrArg(i).getNode());
-}
-
-// markIncompleteNodes - Traverse the graph, identifying nodes that may be
-// modified by other functions that have not been resolved yet.  This marks
-// nodes that are reachable through three sources of "unknownness":
-//
-//  Global Variables, Function Calls, and Incoming Arguments
-//
-// For any node that may have unknown components (because something outside the
-// scope of current analysis may have modified it), the 'Incomplete' flag is
-// added to the NodeType.
-//
-void DSGraph::markIncompleteNodes(unsigned Flags) {
-  // Mark any incoming arguments as incomplete.
-  if (Flags & DSGraph::MarkFormalArgs)
-    for (ReturnNodesTy::iterator FI = ReturnNodes.begin(), E =ReturnNodes.end();
-         FI != E; ++FI) {
-      const Function &F = *FI->first;
-      for (Function::const_arg_iterator I = F.arg_begin(), E = F.arg_end();
-           I != E; ++I)
-        if (isa<PointerType>(I->getType()))
-          markIncompleteNode(getNodeForValue(I).getNode());
-      markIncompleteNode(FI->second.getNode());
-    }
-
-  // Mark stuff passed into functions calls as being incomplete.
-  if (!shouldPrintAuxCalls())
-    for (std::list<DSCallSite>::iterator I = FunctionCalls.begin(),
-           E = FunctionCalls.end(); I != E; ++I)
-      markIncomplete(*I);
-  else
-    for (std::list<DSCallSite>::iterator I = AuxFunctionCalls.begin(),
-           E = AuxFunctionCalls.end(); I != E; ++I)
-      markIncomplete(*I);
-
-#if 0
-  // Mark stuff passed into external functions as being incomplete.
-  // External functions may not appear in Aux during td, so process
-  // them specially
-  for (std::list<DSCallSite>::iterator I = FunctionCalls.begin(),
-         E = FunctionCalls.end(); I != E; ++I)
-    if(I->isDirectCall() && I->getCalleeFunc()->isDeclaration())
-      markIncomplete(*I);
-#endif
-
-  // Mark all global nodes as incomplete.
-  for (DSScalarMap::global_iterator I = ScalarMap.global_begin(),
-         E = ScalarMap.global_end(); I != E; ++I)
-    if (const GlobalVariable *GV = dyn_cast<GlobalVariable>(*I))
-      if (!GV->hasInitializer() ||    // Always mark external globals incomp.
-          (!GV->isConstant() && (Flags & DSGraph::IgnoreGlobals) == 0))
-        markIncompleteNode(ScalarMap[GV].getNode());
-
-  // Mark any node with the VAStart flag as incomplete.
-  if (Flags & DSGraph::MarkVAStart) {
-    for (node_iterator i=node_begin(); i != node_end(); ++i) {
-      markIncompleteNode(i);
-    }
-  }
-}
-
-static inline void killIfUselessEdge(DSNodeHandle &Edge) {
-  if (DSNode * N = Edge.getNode()) // Is there an edge?
-    if (N->getNumReferrers() == 1)  // Does it point to a lonely node?
-      // No interesting info?
-      if ((N->getNodeFlags() & ~DSNode::IncompleteNode) == 0
-          && N->type_begin() == N->type_end()
-          && !N->isNodeCompletelyFolded())
-        Edge.setTo(0, 0);  // Kill the edge!
-}
-
-static void removeIdenticalCalls(std::list<DSCallSite> &Calls) {
-  // Remove trivially identical function calls
-  Calls.sort();  // Sort by callee as primary key!
-
-  // Scan the call list cleaning it up as necessary...
-  DSNodeHandle LastCalleeNode;
-#if 0
-  Function *LastCalleeFunc = 0;
-  unsigned NumDuplicateCalls = 0;
-#endif
-  bool LastCalleeContainsExternalFunction = false;
-
-  unsigned NumDeleted = 0;
-  for (std::list<DSCallSite>::iterator I = Calls.begin(), E = Calls.end();
-       I != E;) {
-    DSCallSite &CS = *I;
-    std::list<DSCallSite>::iterator OldIt = I++;
-
-    if (!CS.isIndirectCall()) {
-      LastCalleeNode = 0;
-    } else {
-      DSNode *Callee = CS.getCalleeNode();
-
-      // If the Callee is a useless edge, this must be an unreachable call site,
-      // eliminate it.
-      if (Callee->getNumReferrers() == 1 && Callee->isCompleteNode() &&
-          Callee->isEmptyGlobals()) {  // No useful info?
-        DEBUG(errs() << "WARNING: Useless call site found.\n");
-        Calls.erase(OldIt);
-        ++NumDeleted;
-        continue;
-      }
-
-      // If the last call site in the list has the same callee as this one, and
-      // if the callee contains an external function, it will never be
-      // resolvable, just merge the call sites.
-      if (!LastCalleeNode.isNull() && LastCalleeNode.getNode() == Callee) {
-        LastCalleeContainsExternalFunction = Callee->isExternFuncNode();
-
-        std::list<DSCallSite>::iterator PrevIt = OldIt;
-        --PrevIt;
-        PrevIt->mergeWith(CS);
-
-        // No need to keep this call anymore.
-        Calls.erase(OldIt);
-        ++NumDeleted;
-        continue;
-      } else {
-        LastCalleeNode = Callee;
-      }
-    }
-
-    // If the return value or any arguments point to a void node with no
-    // information at all in it, and the call node is the only node to point
-    // to it, remove the edge to the node (killing the node).
-    //
-    killIfUselessEdge(CS.getRetVal());
-    for (unsigned a = 0, e = CS.getNumPtrArgs(); a != e; ++a)
-      killIfUselessEdge(CS.getPtrArg(a));
-
-#if 0
-    // If this call site calls the same function as the last call site, and if
-    // the function pointer contains an external function, this node will
-    // never be resolved.  Merge the arguments of the call node because no
-    // information will be lost.
-    //
-    if ((CS.isDirectCall()   && CS.getCalleeFunc() == LastCalleeFunc) ||
-        (CS.isIndirectCall() && CS.getCalleeNode() == LastCalleeNode)) {
-      ++NumDuplicateCalls;
-      if (NumDuplicateCalls == 1) {
-        if (LastCalleeNode)
-          LastCalleeContainsExternalFunction =
-            nodeContainsExternalFunction(LastCalleeNode);
-        else
-          LastCalleeContainsExternalFunction = LastCalleeFunc->isExternal();
-      }
-
-      // It is not clear why, but enabling this code makes DSA really
-      // sensitive to node forwarding.  Basically, with this enabled, DSA
-      // performs different number of inlinings based on which nodes are
-      // forwarding or not.  This is clearly a problem, so this code is
-      // disabled until this can be resolved.
-#if 1
-      if (LastCalleeContainsExternalFunction
-#if 0
-          ||
-          // This should be more than enough context sensitivity!
-          // FIXME: Evaluate how many times this is tripped!
-          NumDuplicateCalls > 20
-#endif
-          ) {
-
-        std::list<DSCallSite>::iterator PrevIt = OldIt;
-        --PrevIt;
-        PrevIt->mergeWith(CS);
-
-        // No need to keep this call anymore.
-        Calls.erase(OldIt);
-        ++NumDeleted;
-        continue;
-      }
-#endif
-    } else {
-      if (CS.isDirectCall()) {
-        LastCalleeFunc = CS.getCalleeFunc();
-        LastCalleeNode = 0;
-      } else {
-        LastCalleeNode = CS.getCalleeNode();
-        LastCalleeFunc = 0;
-      }
-      NumDuplicateCalls = 0;
-    }
-#endif
-
-    if (I != Calls.end() && CS == *I) {
-      LastCalleeNode = 0;
-      Calls.erase(OldIt);
-      ++NumDeleted;
-      continue;
-    }
-  }
-
-  // Resort now that we simplified things.
-  Calls.sort();
-
-  // Now that we are in sorted order, eliminate duplicates.
-  std::list<DSCallSite>::iterator CI = Calls.begin(), CE = Calls.end();
-  if (CI != CE)
-    while (1) {
-      std::list<DSCallSite>::iterator OldIt = CI++;
-      if (CI == CE) break;
-
-      // If this call site is now the same as the previous one, we can delete it
-      // as a duplicate.
-      if (*OldIt == *CI) {
-        DEBUG(errs() << "Deleteing " << CI->getCallSite().getInstruction() << "\n");
-        Calls.erase(CI);
-        CI = OldIt;
-        ++NumDeleted;
-      }
-    }
-
-  //Calls.erase(std::unique(Calls.begin(), Calls.end()), Calls.end());
-
-  // Track the number of call nodes merged away...
-  NumCallNodesMerged += NumDeleted;
-
-  if (NumDeleted)
-    DEBUG(errs() << "Merged " << NumDeleted << " call nodes.\n");
-}
-
-
-// removeTriviallyDeadNodes - After the graph has been constructed, this method
-// removes all unreachable nodes that are created because they got merged with
-// other nodes in the graph.  These nodes will all be trivially unreachable, so
-// we don't have to perform any non-trivial analysis here.
-//
-void DSGraph::removeTriviallyDeadNodes() {
-  /// NOTE: This code is disabled.  This slows down DSA on 177.mesa
-  /// substantially!
-
-  // Loop over all of the nodes in the graph, calling getNode on each field.
-  // This will cause all nodes to update their forwarding edges, causing
-  // forwarded nodes to be delete-able.
-  for (node_iterator NI = node_begin(), E = node_end(); NI != E; ++NI)
-    for (DSNode::edge_iterator ii = NI->edge_begin(), ee = NI->edge_end();
-         ii != ee; ++ii)
-      ii->second.getNode();
-
-  // Likewise, forward any edges from the scalar nodes.  While we are at it,
-  // clean house a bit.
-  for (DSScalarMap::iterator I = ScalarMap.begin(), E = ScalarMap.end();
-       I != E; ++I)
-    I->second.getNode();
-
-  bool isGlobalsGraph = !GlobalsGraph;
-
-  for (NodeListTy::iterator NI = Nodes.begin(), E = Nodes.end(); NI != E; ) {
-    DSNode &Node = *NI;
-
-    // Do not remove *any* global nodes in the globals graph.
-    // This is a special case because such nodes may not have I, M, R flags set.
-    if (Node.isGlobalNode() && isGlobalsGraph) {
-      ++NI;
-      continue;
-    }
-
-    if (Node.isCompleteNode() && !Node.isModifiedNode() && !Node.isReadNode()) {
-      // This is a useless node if it has no mod/ref info (checked above),
-      // outgoing edges (which it cannot, as it is not modified in this
-      // context), and it has no incoming edges.  If it is a global node it may
-      // have all of these properties and still have incoming edges, due to the
-      // scalar map, so we check those now.
-      //
-      if (Node.getNumReferrers() == Node.numGlobals()) {
-
-        // Loop through and make sure all of the globals are referring directly
-        // to the node...
-        for (DSNode::globals_iterator j = Node.globals_begin(), e = Node.globals_end();
-             j != e; ++j) {
-          DSNode *N = getNodeForValue(*j).getNode();
-          assert(N == &Node && "ScalarMap doesn't match globals list!");
-        }
-
-        // Make sure NumReferrers still agrees, if so, the node is truly dead.
-        if (Node.getNumReferrers() == Node.numGlobals()) {
-          for (DSNode::globals_iterator j = Node.globals_begin(), e = Node.globals_end();
-               j != e; ++j)
-            if (ScalarMap.find(*j) != ScalarMap.end())
-              ScalarMap.erase(*j);
-          Node.makeNodeDead();
-          ++NumTrivialGlobalDNE;
-        }
-      }
-    }
-
-    if ((Node.getNodeFlags() == 0 && Node.hasNoReferrers())
-        || (isGlobalsGraph && Node.hasNoReferrers() && !Node.isGlobalNode())){
-      // This node is dead!
-      NI = Nodes.erase(NI);    // Erase & remove from node list.
-      ++NumTrivialDNE;
-    } else {
-      ++NI;
-    }
-  }
-
-  removeIdenticalCalls(FunctionCalls);
-  removeIdenticalCalls(AuxFunctionCalls);
-}
-
-
 /// markReachableNodes - This method recursively traverses the specified
 /// DSNodes, marking any nodes which are reachable.  All reachable nodes it adds
 /// to the set, which allows it to only traverse visited nodes once.
@@ -1669,360 +1002,6 @@
   return false;
 }
 
-// CallSiteUsesAliveArgs - Return true if the specified call site can reach any
-// alive nodes.
-//
-static bool CallSiteUsesAliveArgs(const DSCallSite &CS,
-                                  DenseSet<const DSNode*> &Alive,
-                                  DenseSet<const DSNode*> &Visited,
-                                  bool IgnoreGlobals) {
-  if (CanReachAliveNodes(CS.getRetVal().getNode(), Alive, Visited,
-                         IgnoreGlobals))
-    return true;
-  if (CS.isIndirectCall() &&
-      CanReachAliveNodes(CS.getCalleeNode(), Alive, Visited, IgnoreGlobals))
-    return true;
-  for (unsigned i = 0, e = CS.getNumPtrArgs(); i != e; ++i)
-    if (CanReachAliveNodes(CS.getPtrArg(i).getNode(), Alive, Visited,
-                           IgnoreGlobals))
-      return true;
-  return false;
-}
-
-// removeDeadNodes - Use a more powerful reachability analysis to eliminate
-// subgraphs that are unreachable.  This often occurs because the data
-// structure doesn't "escape" into it's caller, and thus should be eliminated
-// from the caller's graph entirely.  This is only appropriate to use when
-// inlining graphs.
-//
-void DSGraph::removeDeadNodes(unsigned Flags) {
-  DEBUG(AssertGraphOK(); if (GlobalsGraph) GlobalsGraph->AssertGraphOK());
-
-  // Reduce the amount of work we have to do... remove dummy nodes left over by
-  // merging...
-  removeTriviallyDeadNodes();
-
-  // FIXME: Merge non-trivially identical call nodes...
-
-  // Alive - a set that holds all nodes found to be reachable/alive.
-  DenseSet<const DSNode*> Alive;
-  std::vector<std::pair<const Value*, DSNode*> > GlobalNodes;
-
-  // Copy and merge all information about globals to the GlobalsGraph if this is
-  // not a final pass (where unreachable globals are removed).
-  //
-  // Strip all alloca bits since the current function is only for the BU pass.
-  // Strip all incomplete bits since they are short-lived properties and they
-  // will be correctly computed when rematerializing nodes into the functions.
-  //
-  ReachabilityCloner GGCloner(GlobalsGraph, this, DSGraph::StripAllocaBit |
-                              DSGraph::StripIncompleteBit);
-
-  // Mark all nodes reachable by (non-global) scalar nodes as alive...
-  for (DSScalarMap::iterator I = ScalarMap.begin(), E = ScalarMap.end();
-          I != E; ++I)
-    if (isa<GlobalValue > (I->first)) { // Keep track of global nodes
-      assert(!I->second.isNull() && "Null global node?");
-      assert(I->second.getNode()->isGlobalNode() && "Should be a global node!");
-      GlobalNodes.push_back(std::make_pair(I->first, I->second.getNode()));
-
-      // Make sure that all globals are cloned over as roots.
-      if (!(Flags & DSGraph::RemoveUnreachableGlobals) && GlobalsGraph) {
-        DSGraph::ScalarMapTy::iterator SMI =
-          GlobalsGraph->getScalarMap().find(I->first);
-        if (SMI != GlobalsGraph->getScalarMap().end())
-          GGCloner.merge(SMI->second, I->second);
-        else
-          GGCloner.getClonedNH(I->second);
-      }
-    } else {
-      I->second.getNode()->markReachableNodes(Alive);
-    }
-
-  // The return values are alive as well.
-  for (ReturnNodesTy::iterator I = ReturnNodes.begin(), E = ReturnNodes.end();
-       I != E; ++I)
-    I->second.getNode()->markReachableNodes(Alive);
-
-  // Mark any nodes reachable by primary calls as alive...
-  for (fc_iterator I = fc_begin(), E = fc_end(); I != E; ++I)
-    I->markReachableNodes(Alive);
-
-
-  // Now find globals and aux call nodes that are already live or reach a live
-  // value (which makes them live in turn), and continue till no more are found.
-  //
-  bool Iterate;
-  DenseSet<const DSNode*> Visited;
-  std::set<const DSCallSite*> AuxFCallsAlive;
-  do {
-    Visited.clear();
-    // If any global node points to a non-global that is "alive", the global is
-    // "alive" as well...  Remove it from the GlobalNodes list so we only have
-    // unreachable globals in the list.
-    //
-    Iterate = false;
-    if (!(Flags & DSGraph::RemoveUnreachableGlobals))
-      for (unsigned i = 0; i != GlobalNodes.size(); ++i)
-        if (CanReachAliveNodes(GlobalNodes[i].second, Alive, Visited,
-                               Flags & DSGraph::RemoveUnreachableGlobals)) {
-          std::swap(GlobalNodes[i--], GlobalNodes.back()); // Move to end to...
-          GlobalNodes.pop_back();                          // erase efficiently
-          Iterate = true;
-        }
-
-    // Mark only unresolvable call nodes for moving to the GlobalsGraph since
-    // call nodes that get resolved will be difficult to remove from that graph.
-    // The final unresolved call nodes must be handled specially at the end of
-    // the BU pass (i.e., in main or other roots of the call graph).
-    for (afc_iterator CI = afc_begin(), E = afc_end(); CI != E; ++CI)
-      if (!AuxFCallsAlive.count(&*CI) &&
-          (CI->isIndirectCall()
-           || CallSiteUsesAliveArgs(*CI, Alive, Visited,
-                                  Flags & DSGraph::RemoveUnreachableGlobals))) {
-        CI->markReachableNodes(Alive);
-        AuxFCallsAlive.insert(&*CI);
-        Iterate = true;
-      }
-  } while (Iterate);
-
-  // Move dead aux function calls to the end of the list
-  for (std::list<DSCallSite>::iterator CI = AuxFunctionCalls.begin(),
-         E = AuxFunctionCalls.end(); CI != E; )
-    if (AuxFCallsAlive.count(&*CI))
-      ++CI;
-    else {
-      // Copy and merge global nodes and dead aux call nodes into the
-      // GlobalsGraph, and all nodes reachable from those nodes.  Update their
-      // target pointers using the GGCloner.
-      //
-      if (!(Flags & DSGraph::RemoveUnreachableGlobals))
-        GlobalsGraph->AuxFunctionCalls.push_back(DSCallSite(*CI, GGCloner));
-
-      AuxFunctionCalls.erase(CI++);
-    }
-
-  // We are finally done with the GGCloner so we can destroy it.
-  GGCloner.destroy();
-
-  // At this point, any nodes which are visited, but not alive, are nodes
-  // which can be removed.  Loop over all nodes, eliminating completely
-  // unreachable nodes.
-  //
-  std::vector<DSNode*> DeadNodes;
-  DeadNodes.reserve(Nodes.size());
-  for (NodeListTy::iterator NI = Nodes.begin(), E = Nodes.end(); NI != E;) {
-    DSNode *N = NI++;
-    assert(!N->isForwarding() && "Forwarded node in nodes list?");
-
-    if (!Alive.count(N)) {
-      Nodes.remove(N);
-      assert(!N->isForwarding() && "Cannot remove a forwarding node!");
-      DeadNodes.push_back(N);
-      N->dropAllReferences();
-      ++NumDNE;
-    }
-  }
-
-  // Remove all unreachable globals from the ScalarMap.
-  // If flag RemoveUnreachableGlobals is set, GlobalNodes has only dead nodes.
-  // In either case, the dead nodes will not be in the set Alive.
-  for (unsigned i = 0, e = GlobalNodes.size(); i != e; ++i)
-    if (!Alive.count(GlobalNodes[i].second))
-      ScalarMap.erase(GlobalNodes[i].first);
-    else
-      assert((Flags & DSGraph::RemoveUnreachableGlobals) && "non-dead global");
-
-  // Delete all dead nodes now since their referrer counts are zero.
-  for (unsigned i = 0, e = DeadNodes.size(); i != e; ++i)
-    delete DeadNodes[i];
-
-  DEBUG(AssertGraphOK(); GlobalsGraph->AssertGraphOK());
-}
-
-void DSGraph::AssertNodeContainsGlobal(const DSNode *N, const GlobalValue *GV) const {
-  assert(std::find(N->globals_begin(),N->globals_end(), GV) !=
-         N->globals_end() && "Global value not in node!");
-}
-
-void DSGraph::AssertCallSiteInGraph(const DSCallSite &CS) const {
-  if (CS.isIndirectCall()) {
-    AssertNodeInGraph(CS.getCalleeNode());
-#if 0
-    if (CS.getNumPtrArgs() && CS.getCalleeNode() == CS.getPtrArg(0).getNode() &&
-        CS.getCalleeNode() && CS.getCalleeNode()->getGlobals().empty())
-      DEBUG(errs() << "WARNING: WEIRD CALL SITE FOUND!\n");
-#endif
-  }
-  AssertNodeInGraph(CS.getRetVal().getNode());
-  for (unsigned j = 0, e = CS.getNumPtrArgs(); j != e; ++j)
-    AssertNodeInGraph(CS.getPtrArg(j).getNode());
-}
-
-void DSGraph::AssertCallNodesInGraph() const {
-  for (fc_iterator I = fc_begin(), E = fc_end(); I != E; ++I)
-    AssertCallSiteInGraph(*I);
-}
-void DSGraph::AssertAuxCallNodesInGraph() const {
-  for (afc_const_iterator I = afc_begin(), E = afc_end(); I != E; ++I)
-    AssertCallSiteInGraph(*I);
-}
-
-void DSGraph::AssertGraphOK() const {
-  for (node_const_iterator NI = node_begin(), E = node_end(); NI != E; ++NI)
-    NI->assertOK();
-
-  for (ScalarMapTy::const_iterator I = ScalarMap.begin(),
-         E = ScalarMap.end(); I != E; ++I) {
-    assert(!I->second.isNull() && "Null node in scalarmap!");
-    AssertNodeInGraph(I->second.getNode());
-    if (const GlobalValue *GV = dyn_cast<GlobalValue>(I->first)) {
-      assert(I->second.getNode()->isGlobalNode() &&
-             "Global points to node, but node isn't global?");
-      AssertNodeContainsGlobal(I->second.getNode(), GV);
-    }
-  }
-  AssertCallNodesInGraph();
-  AssertAuxCallNodesInGraph();
-
-  // Check that all pointer arguments to any functions in this graph have
-  // destinations.
-  for (ReturnNodesTy::const_iterator RI = ReturnNodes.begin(),
-         E = ReturnNodes.end();
-       RI != E; ++RI) {
-    const Function &F = *RI->first;
-    for (Function::const_arg_iterator AI = F.arg_begin(); AI != F.arg_end(); ++AI)
-      if (isa<PointerType>(AI->getType()))
-        assert(!getNodeForValue(AI).isNull() &&
-               "Pointer argument must be in the scalar map!");
-  }
-}
-
-/// computeNodeMapping - Given roots in two different DSGraphs, traverse the
-/// nodes reachable from the two graphs, computing the mapping of nodes from the
-/// first to the second graph.  This mapping may be many-to-one (i.e. the first
-/// graph may have multiple nodes representing one node in the second graph),
-/// but it will not work if there is a one-to-many or many-to-many mapping.
-///
-void DSGraph::computeNodeMapping(const DSNodeHandle &NH1,
-                                 const DSNodeHandle &NH2, NodeMapTy &NodeMap,
-                                 bool StrictChecking) {
-  DSNode *N1 = NH1.getNode(), *N2 = NH2.getNode();
-  if (N1 == 0 || N2 == 0) return;
-
-  DSNodeHandle &Entry = NodeMap[N1];
-  if (!Entry.isNull()) {
-    // Termination of recursion!
-    if (StrictChecking) {
-      assert(Entry.getNode() == N2 && "Inconsistent mapping detected!");
-      assert((Entry.getOffset() == (NH2.getOffset()-NH1.getOffset()) ||
-              Entry.getNode()->isNodeCompletelyFolded()) &&
-             "Inconsistent mapping detected!");
-    }
-    return;
-  }
-
-  Entry.setTo(N2, NH2.getOffset()-NH1.getOffset());
-
-  // Loop over all of the fields that N1 and N2 have in common, recursively
-  // mapping the edges together now.
-  int N2Idx = NH2.getOffset()-NH1.getOffset();
-  unsigned N2Size = N2->getSize();
-  if (N2Size == 0) return;   // No edges to map to.
-
-  for (unsigned i = 0, e = N1->getSize(); i < e; ++i) {
-    const DSNodeHandle &N1NH = N1->getLink(i);
-    // Don't call N2->getLink if not needed (avoiding crash if N2Idx is not
-    // aligned right).
-    if (!N1NH.isNull()) {
-      if (unsigned(N2Idx)+i < N2Size)
-        computeNodeMapping(N1NH, N2->getLink(N2Idx+i), NodeMap);
-      else
-        computeNodeMapping(N1NH,
-                           N2->getLink(unsigned(N2Idx+i) % N2Size), NodeMap);
-    }
-  }
-}
-
-
-/// computeGToGGMapping - Compute the mapping of nodes in the global graph to
-/// nodes in this graph.
-void DSGraph::computeGToGGMapping(NodeMapTy &NodeMap) {
-  DSGraph &GG = *getGlobalsGraph();
-
-  DSScalarMap &SM = getScalarMap();
-  for (DSScalarMap::global_iterator I = SM.global_begin(),
-         E = SM.global_end(); I != E; ++I)
-    DSGraph::computeNodeMapping(SM[*I], GG.getNodeForValue(*I), NodeMap);
-}
-
-/// computeGGToGMapping - Compute the mapping of nodes in the global graph to
-/// nodes in this graph.  Note that any uses of this method are probably bugs,
-/// unless it is known that the globals graph has been merged into this graph!
-void DSGraph::computeGGToGMapping(InvNodeMapTy &InvNodeMap) {
-  NodeMapTy NodeMap;
-  computeGToGGMapping(NodeMap);
-
-  while (!NodeMap.empty()) {
-    InvNodeMap.insert(std::make_pair(NodeMap.begin()->second,
-                                     NodeMap.begin()->first));
-    NodeMap.erase(NodeMap.begin());
-  }
-}
-
-
-/// computeCalleeCallerMapping - Given a call from a function in the current
-/// graph to the 'Callee' function (which lives in 'CalleeGraph'), compute the
-/// mapping of nodes from the callee to nodes in the caller.
-void DSGraph::computeCalleeCallerMapping(DSCallSite CS, const Function &Callee,
-                                         DSGraph &CalleeGraph,
-                                         NodeMapTy &NodeMap) {
-
-  DSCallSite CalleeArgs =
-    CalleeGraph.getCallSiteForArguments(const_cast<Function&>(Callee));
-
-  computeNodeMapping(CalleeArgs.getRetVal(), CS.getRetVal(), NodeMap);
-
-  unsigned NumArgs = CS.getNumPtrArgs();
-  if (NumArgs > CalleeArgs.getNumPtrArgs())
-    NumArgs = CalleeArgs.getNumPtrArgs();
-
-  for (unsigned i = 0; i != NumArgs; ++i)
-    computeNodeMapping(CalleeArgs.getPtrArg(i), CS.getPtrArg(i), NodeMap);
-
-  // Map the nodes that are pointed to by globals.
-  DSScalarMap &CalleeSM = CalleeGraph.getScalarMap();
-  DSScalarMap &CallerSM = getScalarMap();
-
-  if (CalleeSM.global_size() >= CallerSM.global_size()) {
-    for (DSScalarMap::global_iterator GI = CallerSM.global_begin(),
-           E = CallerSM.global_end(); GI != E; ++GI)
-      if (CalleeSM.global_count(*GI))
-        computeNodeMapping(CalleeSM[*GI], CallerSM[*GI], NodeMap);
-  } else {
-    for (DSScalarMap::global_iterator GI = CalleeSM.global_begin(),
-           E = CalleeSM.global_end(); GI != E; ++GI)
-      if (CallerSM.global_count(*GI))
-        computeNodeMapping(CalleeSM[*GI], CallerSM[*GI], NodeMap);
-  }
-}
-
-/// updateFromGlobalGraph - This function rematerializes global nodes and
-/// nodes reachable from them from the globals graph into the current graph.
-///
-void DSGraph::updateFromGlobalGraph() {
-  ReachabilityCloner RC(this, GlobalsGraph, 0);
-
-  // Clone the non-up-to-date global nodes into this graph.
-  for (DSScalarMap::global_iterator I = getScalarMap().global_begin(),
-         E = getScalarMap().global_end(); I != E; ++I) {
-    DSScalarMap::iterator It = GlobalsGraph->ScalarMap.find(*I);
-    if (It != GlobalsGraph->ScalarMap.end())
-      RC.merge(getNodeForValue(*I), It->second);
-  }
-}
-
-
 ////////////////////////////////////////////////////////////////////////////////
 //Base DataStructures impl:
 ////////////////////////////////////////////////////////////////////////////////
@@ -2226,7 +1205,7 @@
   resetAuxCalls = resetAux;
   TD = D->TD;
   TypeSS = D->TypeSS;
-  ActualCallees = D->ActualCallees;
+  callgraph = D->callgraph;
   GlobalECs = D->getGlobalECs();
   GlobalsGraph = new DSGraph(D->getGlobalsGraph(), GlobalECs, *TypeSS,
                              copyGlobalAuxCalls?0:DSGraph::DontCloneAuxCallNodes);
@@ -2264,7 +1243,7 @@
   // Empty map so next time memory is released, data structures are not
   // re-deleted.
   DSInfo.clear();
-  ActualCallees.clear();
+  callgraph.clear();
   delete GlobalsGraph;
   GlobalsGraph = 0;
 }

Modified: poolalloc/trunk/lib/DSA/Local.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Local.cpp?rev=98315&r1=98314&r2=98315&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/Local.cpp (original)
+++ poolalloc/trunk/lib/DSA/Local.cpp Thu Mar 11 18:16:41 2010
@@ -782,7 +782,7 @@
   // Add a new function call entry...
   if (CalleeNode) {
     G.getFunctionCalls().push_back(DSCallSite(CS, RetVal, CalleeNode, Args));
-    DS->callee_site(CS.getInstruction());
+//    DS->callee_site(CS.getInstruction());
   }else
     G.getFunctionCalls().push_back(DSCallSite(CS, RetVal, cast<Function>(Callee),
                                               Args));

Modified: poolalloc/trunk/lib/DSA/Printer.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Printer.cpp?rev=98315&r1=98314&r2=98315&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/Printer.cpp (original)
+++ poolalloc/trunk/lib/DSA/Printer.cpp Thu Mar 11 18:16:41 2010
@@ -365,17 +365,15 @@
 
 
 void DataStructures::dumpCallGraph() const {
-  for(  ActualCalleesTy::const_iterator ii = ActualCallees.begin(), ee = ActualCallees.end();
-        ii != ee; ++ii) {
-    if (ii->first) errs() << ii->first->getParent()->getParent()->getName() << " ";
-    errs() << ii->first << ": [";
-    for (callee_iterator cbi = ii->second.begin(), cbe = ii->second.end();
-         cbi != cbe; ++cbi) {
-      errs() << (*cbi)->getName() << " ";
+  for (DSCallGraph::key_iterator ki = callgraph.key_begin(),
+          ke = callgraph.key_end(); ki != ke; ++ki)
+    if (*ki != CallSite()) {
+      errs() << ki->getInstruction()->getParent()->getParent()->getName() << ": [";
+      for (DSCallGraph::iterator cbi = callgraph.callee_begin(*ki),
+           cbe = callgraph.callee_end(*ki); cbi != cbe; ++cbi)
+        errs() << (*cbi)->getName() << " ";
+      errs() << "]\n";
     }
-    errs() << "]\n";
-    if (ii->first) ii->first->dump();
-  }
 }
 
 // print - Print out the analysis results...

Modified: poolalloc/trunk/lib/DSA/TopDownClosure.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/TopDownClosure.cpp?rev=98315&r1=98314&r2=98315&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/TopDownClosure.cpp (original)
+++ poolalloc/trunk/lib/DSA/TopDownClosure.cpp Thu Mar 11 18:16:41 2010
@@ -164,12 +164,10 @@
   Visited.insert(G);
 
   // Recursively traverse all of the callee graphs.
-  for (DSGraph::fc_iterator CI = G->fc_begin(), CE = G->fc_end(); CI != CE; ++CI){
-    Instruction *CallI = CI->getCallSite().getInstruction();
-    for (callee_iterator I = callee_begin(CallI),
-           E = callee_end(CallI); I != E; ++I)
+  for (DSGraph::fc_iterator CI = G->fc_begin(), CE = G->fc_end(); CI != CE; ++CI)
+    for (DSCallGraph::iterator I = callgraph.callee_begin(CI->getCallSite()),
+           E = callgraph.callee_end(CI->getCallSite()); I != E; ++I)
       ComputePostOrder(**I, Visited, PostOrder);
-  }
 
   PostOrder.push_back(G);
 }
@@ -301,10 +299,9 @@
       continue;
     }
 
-    Instruction *CallI = CI->getCallSite().getInstruction();
     // For each function in the invoked function list at this call site...
-    callee_iterator IPI =
-      callee_begin(CallI), IPE = callee_end(CallI);
+    DSCallGraph::iterator IPI = callgraph.callee_begin(CI->getCallSite()),
+            IPE = callgraph.callee_end(CI->getCallSite());
 
     // Skip over all calls to this graph (SCC calls).
     while (IPI != IPE && getDSGraph(**IPI) == DSG)
@@ -335,8 +332,8 @@
     // so we build up a new, private, graph that represents the calls of all
     // calls to this set of functions.
     std::vector<const Function*> Callees;
-    for (callee_iterator I = callee_begin(CallI), E = callee_end(CallI);
-         I != E; ++I)
+    for (DSCallGraph::iterator I = callgraph.callee_begin(CI->getCallSite()),
+         E = callgraph.callee_end(CI->getCallSite()); I != E; ++I)
       if (!(*I)->isDeclaration())
         Callees.push_back(*I);
     std::sort(Callees.begin(), Callees.end());

Modified: poolalloc/trunk/lib/PoolAllocate/RunTimeAssociate.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/RunTimeAssociate.cpp?rev=98315&r1=98314&r2=98315&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/RunTimeAssociate.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/RunTimeAssociate.cpp Thu Mar 11 18:16:41 2010
@@ -461,8 +461,8 @@
     Instruction *OrigInst =
       cast<Instruction>(FI.getOldValueIfAvailable(CS.getInstruction()));
 
-    DataStructures::callee_iterator I = DS->callee_begin(OrigInst);
-    if (I != DS->callee_end(OrigInst))
+    DSCallGraph::iterator I = DS->getCallGraph().callee_begin(CS);
+    if (I != DS->getCallGraph().callee_end(CS))
       CF = *I;
 
     // If we didn't find the callee in the constructed call graph, try
@@ -508,7 +508,7 @@
 
 #ifndef NDEBUG
     // Verify that all potential callees at call site have the same DS graph.
-    DataStructures::callee_iterator E = DS->callee_end(OrigInst);
+    DSCallGraph::iterator E = DS->getCallGraph().callee_end(CS);
     for (; I != E; ++I)
       if (!(*I)->isDeclaration())
         assert(CalleeGraph == DS->getDSGraph(**I) &&

Modified: poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp?rev=98315&r1=98314&r2=98315&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp Thu Mar 11 18:16:41 2010
@@ -645,8 +645,8 @@
     Instruction *OrigInst =
       cast<Instruction>(getOldValueIfAvailable(CS.getInstruction()));
 
-    DataStructures::callee_iterator I = Graphs.callee_begin(OrigInst);
-    if (I != Graphs.callee_end(OrigInst))
+    DSCallGraph::iterator I = Graphs.getCallGraph().callee_begin(CS);
+    if (I != Graphs.getCallGraph().callee_end(CS))
       CF = *I;
     
     // If we didn't find the callee in the constructed call graph, try
@@ -685,7 +685,7 @@
     
 #ifndef NDEBUG
     // Verify that all potential callees at call site have the same DS graph.
-    DataStructures::callee_iterator E = Graphs.callee_end(OrigInst);
+    DSCallGraph::iterator E = Graphs.getCallGraph().callee_end(OrigInst);
     for (; I != E; ++I)
       if (!(*I)->isDeclaration())
         assert(CalleeGraph == Graphs.getDSGraph(**I) &&





More information about the llvm-commits mailing list