Honor the shouldPrintAuxCalls flag

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

1 files changed, 9 insertions, 4 deletions

diff --git a/lib/Analysis/DataStructure/Printer.cpp b/lib/Analysis/DataStructure/Printer.cpp
index 8d345a93e9..483d223535 100644
--- a/lib/Analysis/DataStructure/Printer.cpp
+++ b/lib/Analysis/DataStructure/Printer.cpp
@@ -112,7 +112,9 @@ struct DOTGraphTraits<const DSGraph*> : public DefaultDOTGraphTraits {
     }
 
     // Output all of the call nodes...
-    const std::vector<DSCallSite> &FCs = G->getFunctionCalls();
+    const std::vector<DSCallSite> &FCs =
+      G->shouldPrintAuxCalls() ? G->getAuxFunctionCalls()
+      : G->getFunctionCalls();
     for (unsigned i = 0, e = FCs.size(); i != e; ++i) {
       const DSCallSite &Call = FCs[i];
       GW.emitSimpleNode(&Call, "shape=record", "call", Call.getNumPtrArgs()+2);
@@ -169,15 +171,18 @@ static void printCollection(const Collection &C, std::ostream &O,
 
   unsigned TotalNumNodes = 0, TotalCallNodes = 0;
   for (Module::const_iterator I = M->begin(), E = M->end(); I != E; ++I)
-    if (!I->isExternal()) {
+    if (C.hasGraph(*I)) {
       DSGraph &Gr = C.getDSGraph((Function&)*I);
       TotalNumNodes += Gr.getGraphSize();
-      TotalCallNodes += Gr.getFunctionCalls().size();
+      unsigned NumCalls = Gr.shouldPrintAuxCalls() ?
+        Gr.getAuxFunctionCalls().size() : Gr.getFunctionCalls().size();
+
+      TotalCallNodes += NumCalls;
       if (I->getName() == "main" || !OnlyPrintMain)
         Gr.writeGraphToFile(O, Prefix+I->getName());
       else {
         O << "Skipped Writing '" << Prefix+I->getName() << ".dot'... ["
-          << Gr.getGraphSize() << "+" << Gr.getFunctionCalls().size() << "]\n";
+          << Gr.getGraphSize() << "+" << NumCalls << "]\n";
       }
     }