Fix bug in last checkin

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

diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp
index c5e81a71a916c74ddf81c5b6b8df4a84f3c28ccd..c25c8d275ca0c279b73156aeb5da681d804624ea 100644 (file)
--- a/lib/Analysis/DataStructure/DataStructure.cpp
+++ b/lib/Analysis/DataStructure/DataStructure.cpp
@@ -790,7 +790,7 @@ void DSGraph::cloneInto(const DSGraph &G, ScalarMapTy &OldValMap,
                              I->second.getOffset()+MappedNode.getOffset()));
 
     // If this is a global, add the global to this fn or merge if already exists
-    if (isa<GlobalValue>(I->first) && &OldNodeMap != &ScalarMap)
+    if (isa<GlobalValue>(I->first))
       ScalarMap[I->first].mergeWith(H);
   }