[llvm-commits] [llvm] r173338 - /llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp

[Kostya Serebryany]

Author: kcc
Date: Thu Jan 24 04:43:50 2013
New Revision: 173338

URL: http://llvm.org/viewvc/llvm-project?rev=173338&view=rev
Log:
[asan] fix 32-bit builds

Modified:
    llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp

Modified: llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp?rev=173338&r1=173337&r2=173338&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp Thu Jan 24 04:43:50 2013
@@ -875,15 +875,15 @@
   Value *FirstDynamic = 0, *LastDynamic = 0;
 
   for (size_t i = 0; i < n; i++) {
-    static const size_t kMaxGlobalRedzone = 1 << 18;
+    static const uint64_t kMaxGlobalRedzone = 1 << 18;
     GlobalVariable *G = GlobalsToChange[i];
     PointerType *PtrTy = cast<PointerType>(G->getType());
     Type *Ty = PtrTy->getElementType();
     uint64_t SizeInBytes = TD->getTypeAllocSize(Ty);
-    size_t MinRZ = RedzoneSize();
+    uint64_t MinRZ = RedzoneSize();
     // MinRZ <= RZ <= kMaxGlobalRedzone
     // and trying to make RZ to be ~ 1/4 of SizeInBytes.
-    size_t RZ = std::max(MinRZ,
+    uint64_t RZ = std::max(MinRZ,
                          std::min(kMaxGlobalRedzone,
                                   (SizeInBytes / MinRZ / 4) * MinRZ));
     uint64_t RightRedzoneSize = RZ;