From fb8c61056fe63652974a81d87c42f657b9dc1260 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sat, 8 Nov 2003 21:55:50 +0000 Subject: [PATCH] Handle bzero and memset in the local analysis, because we were missing the fact that memset returns its argument!! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9811 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../DataStructure/DSCallSiteIterator.h | 3 +-- lib/Analysis/DataStructure/Local.cpp | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/lib/Analysis/DataStructure/DSCallSiteIterator.h b/lib/Analysis/DataStructure/DSCallSiteIterator.h index 4815c6e8a0e..324111cffad 100644 --- a/lib/Analysis/DataStructure/DSCallSiteIterator.h +++ b/lib/Analysis/DataStructure/DSCallSiteIterator.h @@ -39,8 +39,7 @@ struct DSCallSiteIterator { return F->getName() == "printf" || F->getName() == "sscanf" || F->getName() == "fprintf" || F->getName() == "open" || F->getName() == "sprintf" || F->getName() == "fputs" || - F->getName() == "fscanf" || F->getName() == "bzero" || - F->getName() == "memset"; + F->getName() == "fscanf"; } // isUnresolvableFunction - Return true if this is an unresolvable diff --git a/lib/Analysis/DataStructure/Local.cpp b/lib/Analysis/DataStructure/Local.cpp index 689373ee7d2..f3406b76990 100644 --- a/lib/Analysis/DataStructure/Local.cpp +++ b/lib/Analysis/DataStructure/Local.cpp @@ -435,8 +435,22 @@ void GraphBuilder::visitCallSite(CallSite CS) { } else if (F->getName() == "realloc") { DSNodeHandle RetNH = getValueDest(*CS.getInstruction()); RetNH.mergeWith(getValueDest(**CS.arg_begin())); - DSNode *N = RetNH.getNode(); - if (N) N->setHeapNodeMarker()->setModifiedMarker()->setReadMarker(); + if (DSNode *N = RetNH.getNode()) + N->setHeapNodeMarker()->setModifiedMarker()->setReadMarker(); + return; + } else if (F->getName() == "memset") { + // Merge the first argument with the return value, and mark the memory + // modified. + DSNodeHandle RetNH = getValueDest(*CS.getInstruction()); + RetNH.mergeWith(getValueDest(**CS.arg_begin())); + if (DSNode *N = RetNH.getNode()) + N->setModifiedMarker(); + return; + } else if (F->getName() == "bzero") { + // Mark the memory modified. + DSNodeHandle H = getValueDest(**CS.arg_begin()); + if (DSNode *N = H.getNode()) + N->setModifiedMarker(); return; }