Do not treat global variables as functions! (and assert failing)

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

diff --git a/lib/Analysis/DataStructure/DSCallSiteIterator.h b/lib/Analysis/DataStructure/DSCallSiteIterator.h
index 783bfa58dabead7a2e2c6eab406ed501b6fe95fd..39a16d6f7e17a627ad30e08d452dcc8cf4f1210b 100644 (file)
--- a/lib/Analysis/DataStructure/DSCallSiteIterator.h
+++ b/lib/Analysis/DataStructure/DSCallSiteIterator.h
@@ -39,9 +39,11 @@ struct DSCallSiteIterator {
         DSNode *CalleeNode = (*FCs)[CallSite].getCalleeNode();
         if (CallSiteEntry || isCompleteNode(CalleeNode)) {
           const std::vector<GlobalValue*> &Callees = CalleeNode->getGlobals();
-          
-          if (CallSiteEntry < Callees.size())
-            return;
+          while (CallSiteEntry < Callees.size()) {
+            if (isa<Function>(Callees[CallSiteEntry]))
+              return;
+            ++CallSiteEntry;
+          }
         }
       }
       CallSiteEntry = 0;