[llvm-commits] CVS: llvm/lib/Analysis/DataStructure/DataStructure.cpp

[Chris Lattner]

Changes in directory llvm/lib/Analysis/DataStructure:

DataStructure.cpp updated: 1.174 -> 1.175

---
Log message:

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


---
Diffs of the changes:  (+1 -2)

Index: llvm/lib/Analysis/DataStructure/DataStructure.cpp
diff -u llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.174 llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.175
--- llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.174	Thu Jun 17 13:18:26 2004
+++ llvm/lib/Analysis/DataStructure/DataStructure.cpp	Wed Jun 23 01:29:59 2004
@@ -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);
     }
   }