[compiler-rt] r220674 - [Tsan] Fix references to renamed variables in DPrintf()

[Viktor Kutuzov]

Author: vkutuzov
Date: Mon Oct 27 06:22:24 2014
New Revision: 220674

URL: http://llvm.org/viewvc/llvm-project?rev=220674&view=rev
Log:
[Tsan] Fix references to renamed variables in DPrintf()
Differential Revision: http://reviews.llvm.org/D5993

Modified:
    compiler-rt/trunk/lib/tsan/rtl/tsan_platform_linux.cc

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_platform_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_platform_linux.cc?rev=220674&r1=220673&r2=220674&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_platform_linux.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_platform_linux.cc Mon Oct 27 06:22:24 2014
@@ -251,8 +251,8 @@ void InitializeShadowMemory() {
       (kShadowEnd - kShadowBeg) >> 30);
 
   // Map meta shadow.
-  uptr meta = (uptr)MmapFixedNoReserve(kMetaShadowBeg,
-      kMetaShadowEnd - kMetaShadowBeg);
+  uptr meta_size = kMetaShadowEnd - kMetaShadowBeg;
+  uptr meta = (uptr)MmapFixedNoReserve(kMetaShadowBeg, meta_size);
   if (meta != kMetaShadowBeg) {
     Printf("FATAL: ThreadSanitizer can not mmap the shadow memory\n");
     Printf("FATAL: Make sure to compile with -fPIE and "
@@ -260,7 +260,7 @@ void InitializeShadowMemory() {
     Die();
   }
   DPrintf("meta shadow: %zx-%zx (%zuGB)\n",
-      kMetaShadow, kMetaShadow + kMetaSize, kMetaSize >> 30);
+      meta, meta + meta_size, meta_size >> 30);
 
   MapRodata();
 }