Transform BU pass to not use the horrible DSCallSiteIterator class.

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

2 files changed, 54 insertions, 176 deletions

diff --git a/lib/Analysis/DataStructure/BottomUpClosure.cpp b/lib/Analysis/DataStructure/BottomUpClosure.cpp
index 19030084a9e..928946fde97 100644
--- a/lib/Analysis/DataStructure/BottomUpClosure.cpp
+++ b/lib/Analysis/DataStructure/BottomUpClosure.cpp
@@ -15,10 +15,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/DataStructure/DataStructure.h"
+#include "llvm/Analysis/DataStructure/DSGraph.h"
 #include "llvm/Module.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Support/Debug.h"
-#include "DSCallSiteIterator.h"
 using namespace llvm;
 
 namespace {
@@ -30,8 +30,6 @@ namespace {
   X("budatastructure", "Bottom-up Data Structure Analysis");
 }
 
-using namespace DS;
-
 // run - Calculate the bottom up data structure graphs for each function in the
 // program.
 //
@@ -125,6 +123,45 @@ DSGraph &BUDataStructures::getOrCreateGraph(Function *F) {
   return *Graph;
 }
 
+static bool isVAHackFn(const Function *F) {
+  return F->getName() == "printf"  || F->getName() == "sscanf" ||
+    F->getName() == "fprintf" || F->getName() == "open" ||
+    F->getName() == "sprintf" || F->getName() == "fputs" ||
+    F->getName() == "fscanf";
+}
+
+static bool isResolvableFunc(const Function* callee) {
+  return !callee->isExternal() || isVAHackFn(callee);
+}
+
+static void GetAllCallees(const DSCallSite &CS, 
+                          std::vector<Function*> &Callees) {
+  if (CS.isDirectCall()) {
+    if (isResolvableFunc(CS.getCalleeFunc()))
+      Callees.push_back(CS.getCalleeFunc());
+  } else if (!CS.getCalleeNode()->isIncomplete()) {
+    // Get all callees.
+    unsigned OldSize = Callees.size();
+    CS.getCalleeNode()->addFullFunctionList(Callees);
+    
+    // If any of the callees are unresolvable, remove the whole batch!
+    for (unsigned i = OldSize, e = Callees.size(); i != e; ++i)
+      if (!isResolvableFunc(Callees[i])) {
+        Callees.erase(Callees.begin()+OldSize, Callees.end());
+        return;
+      }
+  }
+}
+
+
+/// GetAllAuxCallees - Return a list containing all of the resolvable callees in
+/// the aux list for the specified graph in the Callees vector.
+static void GetAllAuxCallees(DSGraph &G, std::vector<Function*> &Callees) {
+  Callees.clear();
+  for (DSGraph::afc_iterator I = G.afc_begin(), E = G.afc_end(); I != E; ++I)
+    GetAllCallees(*I, Callees);
+}
+
 unsigned BUDataStructures::calculateGraphs(Function *F,
                                            std::vector<Function*> &Stack,
                                            unsigned &NextID, 
@@ -146,10 +183,13 @@ unsigned BUDataStructures::calculateGraphs(Function *F,
 
   DSGraph &Graph = getOrCreateGraph(F);
 
+  // Find all callee functions.
+  std::vector<Function*> CalleeFunctions;
+  GetAllAuxCallees(Graph, CalleeFunctions);
+
   // The edges out of the current node are the call site targets...
-  for (DSCallSiteIterator I = DSCallSiteIterator::begin_aux(Graph),
-         E = DSCallSiteIterator::end_aux(Graph); I != E; ++I) {
-    Function *Callee = *I;
+  for (unsigned i = 0, e = CalleeFunctions.size(); i != e; ++i) {
+    Function *Callee = CalleeFunctions[i];
     unsigned M;
     // Have we visited the destination function yet?
     hash_map<Function*, unsigned>::iterator It = ValMap.find(Callee);
@@ -178,8 +218,10 @@ unsigned BUDataStructures::calculateGraphs(Function *F,
 
     if (MaxSCC < 1) MaxSCC = 1;
 
-    // Should we revisit the graph?
-    if (DSCallSiteIterator::begin_aux(G) != DSCallSiteIterator::end_aux(G)) {
+    // Should we revisit the graph?  Only do it if there are now new resolvable
+    // callees.
+    GetAllAuxCallees(Graph, CalleeFunctions);
+    if (!CalleeFunctions.empty()) {
       ValMap.erase(F);
       return calculateGraphs(F, Stack, NextID, ValMap);
     } else {
@@ -278,20 +320,6 @@ void BUDataStructures::releaseMemory() {
   GlobalsGraph = 0;
 }
 
-static bool isVAHackFn(const Function *F) {
-  return F->getName() == "printf"  || F->getName() == "sscanf" ||
-    F->getName() == "fprintf" || F->getName() == "open" ||
-    F->getName() == "sprintf" || F->getName() == "fputs" ||
-    F->getName() == "fscanf";
-}
-
-// isUnresolvableFunction - Return true if this is an unresolvable
-// external function.  A direct or indirect call to this cannot be resolved.
-// 
-static bool isResolvableFunc(const Function* callee) {
-  return !callee->isExternal() || isVAHackFn(callee);
-}
-
 void BUDataStructures::calculateGraph(DSGraph &Graph) {
   // Move our call site list into TempFCs so that inline call sites go into the
   // new call site list and doesn't invalidate our iterators!
@@ -313,26 +341,12 @@ void BUDataStructures::calculateGraph(DSGraph &Graph) {
     if (CS.getRetVal().isNull() && CS.getNumPtrArgs() == 0) {
       TempFCs.erase(TempFCs.begin());
       continue;
+    } else if (CS.isDirectCall() && isVAHackFn(CS.getCalleeFunc())) {
+      TempFCs.erase(TempFCs.begin());
+      continue;
     }
 
-    if (CS.isDirectCall()) {
-      Function *F = CS.getCalleeFunc();
-      if (isResolvableFunc(F))
-        if (F->isExternal()) {  // Call to fprintf, etc.
-          TempFCs.erase(TempFCs.begin());
-          continue;
-        } else {
-          CalledFuncs.push_back(F);
-        }
-    } else {
-      DSNode *Node = CS.getCalleeNode();
-
-      if (!Node->isIncomplete())
-        for (unsigned i = 0, e = Node->getGlobals().size(); i != e; ++i)
-          if (Function *CF = dyn_cast<Function>(Node->getGlobals()[i]))
-            if (isResolvableFunc(CF) && !CF->isExternal())
-              CalledFuncs.push_back(CF);
-    }
+    GetAllCallees(CS, CalledFuncs);
 
     if (CalledFuncs.empty()) {
       // Remember that we could not resolve this yet!
diff --git a/lib/Analysis/DataStructure/DSCallSiteIterator.h b/lib/Analysis/DataStructure/DSCallSiteIterator.h
deleted file mode 100644
index bc51fcf3caa..00000000000
--- a/lib/Analysis/DataStructure/DSCallSiteIterator.h
+++ /dev/null
@@ -1,136 +0,0 @@
-//===- DSCallSiteIterator.h - Iterator for DSGraph call sites ---*- 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.
-// 
-//===----------------------------------------------------------------------===//
-//
-// This file implements an iterator for complete call sites in DSGraphs.  This
-// code can either iterator over the normal call list or the aux calls list, and
-// is used by the TD and BU passes.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef DSCALLSITEITERATOR_H
-#define DSCALLSITEITERATOR_H
-
-#include "llvm/Analysis/DataStructure/DSGraph.h"
-#include "llvm/Function.h"
-
-namespace llvm {
-
-struct DSCallSiteIterator {
-  // FCs are the edges out of the current node are the call site targets...
-  std::list<DSCallSite> *FCs;
-  std::list<DSCallSite>::iterator CallSite;
-  unsigned CallSiteEntry;
-
-  DSCallSiteIterator(std::list<DSCallSite> &CS) : FCs(&CS) {
-    CallSite = CS.begin(); CallSiteEntry = 0;
-    advanceToValidCallee();
-  }
-
-  // End iterator ctor.
-  DSCallSiteIterator(std::list<DSCallSite> &CS, bool) : FCs(&CS) {
-    CallSite = CS.end(); CallSiteEntry = 0;
-  }
-
-  static bool isVAHackFn(const Function *F) {
-    return F->getName() == "printf"  || F->getName() == "sscanf" ||
-      F->getName() == "fprintf" || F->getName() == "open" ||
-      F->getName() == "sprintf" || F->getName() == "fputs" ||
-      F->getName() == "fscanf";
-  }
-
-  // isUnresolvableFunction - Return true if this is an unresolvable
-  // external function.  A direct or indirect call to this cannot be resolved.
-  // 
-  static bool isUnresolvableFunc(const Function* callee) {
-    return callee->isExternal() && !isVAHackFn(callee);
-  } 
-
-  void advanceToValidCallee() {
-    while (CallSite != FCs->end()) {
-      if (CallSite->isDirectCall()) {
-        if (CallSiteEntry == 0 &&        // direct call only has one target...
-            ! isUnresolvableFunc(CallSite->getCalleeFunc()))
-          return;                       // and not an unresolvable external func
-      } else {
-        DSNode *CalleeNode = CallSite->getCalleeNode();
-        if (CallSiteEntry || isCompleteNode(CalleeNode)) {
-          const std::vector<GlobalValue*> &Callees = CalleeNode->getGlobals();
-          while (CallSiteEntry < Callees.size()) {
-            if (isa<Function>(Callees[CallSiteEntry]))
-              return;
-            ++CallSiteEntry;
-          }
-        }
-      }
-      CallSiteEntry = 0;
-      ++CallSite;
-    }
-  }
-  
-  // isCompleteNode - Return true if we know all of the targets of this node,
-  // and if the call sites are not external.
-  //
-  static inline bool isCompleteNode(DSNode *N) {
-    if (N->isIncomplete()) return false;
-    const std::vector<GlobalValue*> &Callees = N->getGlobals();
-    for (unsigned i = 0, e = Callees.size(); i != e; ++i)
-      if (isUnresolvableFunc(cast<Function>(Callees[i])))
-        return false;               // Unresolvable external function found...
-    return true;  // otherwise ok
-  }
-
-public:
-  static DSCallSiteIterator begin_aux(DSGraph &G) {
-    return G.getAuxFunctionCalls();
-  }
-  static DSCallSiteIterator end_aux(DSGraph &G) {
-    return DSCallSiteIterator(G.getAuxFunctionCalls(), true);
-  }
-  static DSCallSiteIterator begin_std(DSGraph &G) {
-    return G.getFunctionCalls();
-  }
-  static DSCallSiteIterator end_std(DSGraph &G) {
-    return DSCallSiteIterator(G.getFunctionCalls(), true);
-  }
-  static DSCallSiteIterator begin(std::list<DSCallSite> &CSs) { return CSs; }
-  static DSCallSiteIterator end(std::list<DSCallSite> &CSs) {
-    return DSCallSiteIterator(CSs, true);
-  }
-  bool operator==(const DSCallSiteIterator &CSI) const {
-    return CallSite == CSI.CallSite && CallSiteEntry == CSI.CallSiteEntry;
-  }
-  bool operator!=(const DSCallSiteIterator &CSI) const {
-    return !operator==(CSI);
-  }
-
-  std::list<DSCallSite>::iterator getCallSiteIdx() const { return CallSite; }
-  const DSCallSite &getCallSite() const { return *CallSite; }
-
-  Function *operator*() const {
-    if (CallSite->isDirectCall()) {
-      return CallSite->getCalleeFunc();
-    } else {
-      DSNode *Node = CallSite->getCalleeNode();
-      return cast<Function>(Node->getGlobals()[CallSiteEntry]);
-    }
-  }
-
-  DSCallSiteIterator& operator++() {                // Preincrement
-    ++CallSiteEntry;
-    advanceToValidCallee();
-    return *this;
-  }
-  DSCallSiteIterator operator++(int) { // Postincrement
-    DSCallSiteIterator tmp = *this; ++*this; return tmp; 
-  }
-};
-
-} // End llvm namespace
-
-#endif