Changes in directory llvm/lib/Analysis/DataStructure:
Local.cpp updated: 1.147 -> 1.148 --- Log message: I understand now. Shoot. --- Diffs of the changes: (+3 -21) Local.cpp | 24 +++--------------------- 1 files changed, 3 insertions(+), 21 deletions(-) Index: llvm/lib/Analysis/DataStructure/Local.cpp diff -u llvm/lib/Analysis/DataStructure/Local.cpp:1.147 llvm/lib/Analysis/DataStructure/Local.cpp:1.148 --- llvm/lib/Analysis/DataStructure/Local.cpp:1.147 Tue Apr 18 15:59:52 2006 +++ llvm/lib/Analysis/DataStructure/Local.cpp Tue Apr 18 17:36:11 2006 @@ -549,30 +549,12 @@ case Intrinsic::memcpy_i64: case Intrinsic::memmove_i32: case Intrinsic::memmove_i64: { - //This is over aggressive. What these functions do is not make the - // targets pointers alias, but rather merge the out edges of the graphs - // for the pointers according to the type merging of the graphs. - //Simply merging the two graphs is a crude approximation to this. - //Instead, copy the src pointer graph, then merge the copy with the - //dest pointer, thus avoiding contaminating the src with info from the dest - //I might be wrong though. - // Merge the first & second arguments, and mark the memory read and - // modified. Preserve second graph + // modified. DSNodeHandle RetNH = getValueDest(**CS.arg_begin()); - DSNodeHandle SrcNH = getValueDest(**(CS.arg_begin()+1)); - //copy dsnode - DSNode* copy = new DSNode(*SrcNH.getNode(), SrcNH.getNode()->getParentGraph()); - //since this is the target memory, we only are interested in the links. - //the target will not wind up with a global memory object , unless it - //was already there (only pointers to global memory objects) - copy->clearGlobals(); - DSNodeHandle Copy( copy, SrcNH.getOffset()); - RetNH.mergeWith(Copy); + RetNH.mergeWith(getValueDest(**(CS.arg_begin()+1))); if (DSNode *N = RetNH.getNode()) - N->setModifiedMarker(); - if (DSNode *N = SrcNH.getNode()) - N->setReadMarker(); + N->setModifiedMarker()->setReadMarker(); return; } case Intrinsic::memset_i32: _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits