[llvm-commits] [compiler-rt] r162020 - /compiler-rt/trunk/lib/tsan/rtl/tsan_platform.h

[Dmitry Vyukov]

Author: dvyukov
Date: Thu Aug 16 09:20:45 2012
New Revision: 162020

URL: http://llvm.org/viewvc/llvm-project?rev=162020&view=rev
Log:
tsan: fix COMPAT shadow mapping once again

Modified:
    compiler-rt/trunk/lib/tsan/rtl/tsan_platform.h

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_platform.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_platform.h?rev=162020&r1=162019&r2=162020&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_platform.h (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_platform.h Thu Aug 16 09:20:45 2012
@@ -72,7 +72,7 @@
 // COMPAT mapping is not quite one-to-one.
 static inline uptr AlternativeAddress(uptr addr) {
 #if defined(TSAN_COMPAT_SHADOW) && TSAN_COMPAT_SHADOW
-  return addr | 0x280000000000ULL;
+  return (addr & ~kLinuxAppMemMsk) | 0x280000000000ULL;
 #else
   return 0;
 #endif