[llvm-commits] [llvm] r158210 - /llvm/trunk/lib/Transforms/Scalar/BoundsChecking.cpp
Nuno Lopes
nunoplopes at sapo.pt
Fri Jun 8 09:31:42 PDT 2012
Author: nlopes
Date: Fri Jun 8 11:31:42 2012
New Revision: 158210
URL: http://llvm.org/viewvc/llvm-project?rev=158210&view=rev
Log:
BoundsChecking: add support for ConstantPointerNull. fixes a bunch of instrumentation failures in loops with reallocs
Modified:
llvm/trunk/lib/Transforms/Scalar/BoundsChecking.cpp
Modified: llvm/trunk/lib/Transforms/Scalar/BoundsChecking.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/BoundsChecking.cpp?rev=158210&r1=158209&r2=158210&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/BoundsChecking.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/BoundsChecking.cpp Fri Jun 8 11:31:42 2012
@@ -377,11 +377,13 @@
}
RETURN(true);
- // TODO: handle more standard functions:
+ // TODO: handle more standard functions (+ wchar cousins):
// - strdup / strndup
// - strcpy / strncpy
+ // - strcat / strncat
// - memcpy / memmove
// - strcat / strncat
+ // - memset
} else if (PHINode *PHI = dyn_cast<PHINode>(Ptr)) {
// create 2 PHIs: one for offset and another for size
@@ -389,8 +391,7 @@
PHINode *SizePHI = Builder->CreatePHI(IntTy, PHI->getNumIncomingValues());
// insert right away in the cache to handle recursive PHIs
- CacheData CacheEntry(APInt(), OffsetPHI, APInt(), SizePHI, true);
- CacheMap[Ptr] = CacheEntry;
+ CacheMap[Ptr] = CacheData(APInt(), OffsetPHI, APInt(), SizePHI, true);
// compute offset/size for each PHI incoming pointer
for (unsigned i = 0, e = PHI->getNumIncomingValues(); i != e; ++i) {
@@ -419,7 +420,7 @@
SizeValue = SizePHI;
RETURN(true);
- } else if (isa<UndefValue>(Ptr)) {
+ } else if (isa<UndefValue>(Ptr) || isa<ConstantPointerNull>(Ptr)) {
Size = 0;
RETURN(true);
@@ -428,12 +429,12 @@
RETURN(false);
}
+ DEBUG(dbgs() << "computeAllocSize unhandled value:\n" << *Ptr << "\n");
RETURN(false);
cache_and_return:
// cache the result and return
- CacheData CacheEntry(Offset, OffsetValue, Size, SizeValue, ReturnVal);
- CacheMap[Ptr] = CacheEntry;
+ CacheMap[Ptr] = CacheData(Offset, OffsetValue, Size, SizeValue, ReturnVal);
// non-computable results can be safely cached
if (!ReturnVal)
More information about the llvm-commits
mailing list