commit 0441388affe47d1219e1f37665844df7b0bdd657
author Chris Lattner <sabre@nondot.org> Wed Jun 23 06:29:59 2004 +0000
committer Chris Lattner <sabre@nondot.org> Wed Jun 23 06:29:59 2004 +0000
tree 3a2574f18b06aefc4c10c7bbf386e92bc69c567e
parent 1ea8447089a1b71373ea00473f5d453e143fc251

Fix merging of nodes whose incoming offset is not zero.  This unbreaks DSA on
several mallocbench programs, including perl.

llvm-svn: 14342

llvm/lib/Analysis/DataStructure/DataStructure.cpp

diff --git a/llvm/lib/Analysis/DataStructure/DataStructure.cpp b/llvm/lib/Analysis/DataStructure/DataStructure.cpp
index a15f374..53c39f9 100644
--- a/llvm/lib/Analysis/DataStructure/DataStructure.cpp
+++ b/llvm/lib/Analysis/DataStructure/DataStructure.cpp
@@ -825,8 +825,7 @@
       unsigned MergeOffset = 0;
       DSNode *CN = NH.getNode();
       if (CN->getSize() != 1)
-        MergeOffset = ((i << DS::PointerShift)+NH.getOffset()
-                       - SrcNH.getOffset()) %CN->getSize();
+        MergeOffset = ((i << DS::PointerShift)+NH.getOffset()) % CN->getSize();
       CN->addEdgeTo(MergeOffset, DestEdge);
     }
   }