From: Chris Lattner <sabre@nondot.org>
Date: Wed, 23 Jun 2004 06:29:59 +0000 (+0000)
Subject: Fix merging of nodes whose incoming offset is not zero.  This unbreaks DSA on
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=37ec591c746775ad71c30fc2aae5affd469d3370;p=oota-llvm.git

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


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

diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp
index a15f3743d83..53c39f9047c 100644
--- a/lib/Analysis/DataStructure/DataStructure.cpp
+++ b/lib/Analysis/DataStructure/DataStructure.cpp
@@ -825,8 +825,7 @@ DSNodeHandle ReachabilityCloner::getClonedNH(const DSNodeHandle &SrcNH) {
       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);
     }
   }