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

llvm-svn: 7030

1 files changed, 5 insertions, 3 deletions

diff --git a/llvm/lib/Analysis/DataStructure/DSCallSiteIterator.h b/llvm/lib/Analysis/DataStructure/DSCallSiteIterator.h
index 783bfa58dab..39a16d6f7e1 100644
--- a/llvm/lib/Analysis/DataStructure/DSCallSiteIterator.h
+++ b/llvm/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;