2 files changed, 8 insertions, 14 deletions
diff --git a/lib/Analysis/DataStructure/Steensgaard.cpp b/lib/Analysis/DataStructure/Steensgaard.cpp
index 9ed65bb975..d62d699318 100644
--- a/lib/Analysis/DataStructure/Steensgaard.cpp
+++ b/lib/Analysis/DataStructure/Steensgaard.cpp
@@ -165,21 +165,17 @@ bool Steens::runOnModule(Module &M) {
     DSCallSite &CurCall = *CI++;
     
     // Loop over the called functions, eliminating as many as possible...
-    std::vector<GlobalValue*> CallTargets;
+    std::vector<Function*> CallTargets;
     if (CurCall.isDirectCall())
       CallTargets.push_back(CurCall.getCalleeFunc());
     else 
-      CallTargets = CurCall.getCalleeNode()->getGlobals();
+      CurCall.getCalleeNode()->addFullFunctionList(CallTargets);
 
     for (unsigned c = 0; c != CallTargets.size(); ) {
       // If we can eliminate this function call, do so!
-      bool Eliminated = false;
-      if (Function *F = dyn_cast<Function>(CallTargets[c]))
-        if (!F->isExternal()) {
-          ResolveFunctionCall(F, CurCall, RetValMap[F]);
-          Eliminated = true;
-        }
-      if (Eliminated) {
+      Function *F = CallTargets[c];
+      if (!F->isExternal()) {
+        ResolveFunctionCall(F, CurCall, RetValMap[F]);
         CallTargets[c] = CallTargets.back();
         CallTargets.pop_back();
       } else
diff --git a/lib/Analysis/DataStructure/TopDownClosure.cpp b/lib/Analysis/DataStructure/TopDownClosure.cpp
index 9a661e24a5..fb367a8e68 100644
--- a/lib/Analysis/DataStructure/TopDownClosure.cpp
+++ b/lib/Analysis/DataStructure/TopDownClosure.cpp
@@ -37,11 +37,9 @@ void TDDataStructures::markReachableFunctionsExternallyAccessible(DSNode *N,
   for (unsigned i = 0, e = N->getNumLinks(); i != e; ++i) {
     DSNodeHandle &NH = N->getLink(i*N->getPointerSize());
     if (DSNode *NN = NH.getNode()) {
-      const std::vector<GlobalValue*> &Globals = NN->getGlobals();
-      for (unsigned G = 0, e = Globals.size(); G != e; ++G)
-        if (Function *F = dyn_cast<Function>(Globals[G]))
-          ArgsRemainIncomplete.insert(F);
-
+      std::vector<Function*> Functions;
+      NN->addFullFunctionList(Functions);
+      ArgsRemainIncomplete.insert(Functions.begin(), Functions.end());
       markReachableFunctionsExternallyAccessible(NN, Visited);
     }
   }