diff --git a/llvm/lib/Analysis/DataStructure/DataStructure.cpp b/llvm/lib/Analysis/DataStructure/DataStructure.cpp
index bf487d8..30ce4f9 100644
--- a/llvm/lib/Analysis/DataStructure/DataStructure.cpp
+++ b/llvm/lib/Analysis/DataStructure/DataStructure.cpp
@@ -766,14 +766,11 @@
       markIncomplete(AuxFunctionCalls[i]);
     
 
-  // Mark all of the nodes pointed to by global nodes as incomplete...
-  for (unsigned i = 0, e = Nodes.size(); i != e; ++i)
-    if (Nodes[i]->NodeType & DSNode::GlobalNode) {
-      DSNode *N = Nodes[i];
-      for (unsigned i = 0, e = N->getSize(); i < e; i += DS::PointerSize)
-        if (DSNode *DSN = N->getLink(i).getNode())
-          markIncompleteNode(DSN);
-    }
+  // Mark all global nodes as incomplete...
+  if ((Flags & DSGraph::IgnoreGlobals) == 0)
+    for (unsigned i = 0, e = Nodes.size(); i != e; ++i)
+      if (Nodes[i]->NodeType & DSNode::GlobalNode)
+        markIncompleteNode(Nodes[i]);
 }
 
 static inline void killIfUselessEdge(DSNodeHandle &Edge) {