[llvm-commits] [compiler-rt] r173026 - in /compiler-rt/trunk/lib/asan: asan_mapping.h tests/CMakeLists.txt tests/asan_noinst_test.cc

[Alexey Samsonov]

Author: samsonov
Date: Mon Jan 21 05:36:38 2013
New Revision: 173026

URL: http://llvm.org/viewvc/llvm-project?rev=173026&view=rev
Log:
Fixup for r173021: build tests with zero-based shadow on Android only, fix condition in checking for shadow gap in asan_mapping.h

Modified:
    compiler-rt/trunk/lib/asan/asan_mapping.h
    compiler-rt/trunk/lib/asan/tests/CMakeLists.txt
    compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc

Modified: compiler-rt/trunk/lib/asan/asan_mapping.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_mapping.h?rev=173026&r1=173025&r2=173026&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_mapping.h (original)
+++ compiler-rt/trunk/lib/asan/asan_mapping.h Mon Jan 21 05:36:38 2013
@@ -113,7 +113,7 @@
 static inline bool AddrIsInShadowGap(uptr a) {
   // In zero-based shadow mode we treat addresses near zero as addresses
   // in shadow gap as well.
-  if (ASAN_FLEXIBLE_MAPPING_AND_OFFSET)
+  if (SHADOW_OFFSET == 0)
     return a <= kShadowGapEnd;
   return a >= kShadowGapBeg && a <= kShadowGapEnd;
 }

Modified: compiler-rt/trunk/lib/asan/tests/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/CMakeLists.txt?rev=173026&r1=173025&r2=173026&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/tests/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/asan/tests/CMakeLists.txt Mon Jan 21 05:36:38 2013
@@ -15,8 +15,8 @@
 include_directories(..)
 include_directories(../..)
 
-# Use zero-based shadow on Linux and Android.
-if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+# Use zero-based shadow on Android.
+if(ANDROID)
   set(ASAN_TESTS_USE_ZERO_BASE_SHADOW TRUE)
 else()
   set(ASAN_TESTS_USE_ZERO_BASE_SHADOW FALSE)

Modified: compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc?rev=173026&r1=173025&r2=173026&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc (original)
+++ compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc Mon Jan 21 05:36:38 2013
@@ -330,8 +330,8 @@
   // Prevent inlining of memset().
   volatile memset_p libc_memset = (memset_p)memset;
   EXPECT_DEATH(libc_memset((void*)(kLowShadowBeg + 200), 0, 100),
-               ASAN_FLEXIBLE_MAPPING_AND_OFFSET ? "unknown-crash.*shadow gap"
-                                                : "unknown-crash.*low shadow");
+               (kLowShadowEnd == 0) ? "unknown-crash.*shadow gap"
+                                    : "unknown-crash.*low shadow");
   EXPECT_DEATH(libc_memset((void*)(kShadowGapBeg + 200), 0, 100),
                "unknown-crash.*shadow gap");
   EXPECT_DEATH(libc_memset((void*)(kHighShadowBeg + 200), 0, 100),