[llvm-branch-commits] [compiler-rt-branch] r242848 - Merging r242647 and r242651:

[Hans Wennborg]

Author: hans
Date: Tue Jul 21 17:46:35 2015
New Revision: 242848

URL: http://llvm.org/viewvc/llvm-project?rev=242848&view=rev
Log:
Merging r242647 and r242651:

------------------------------------------------------------------------
r242647 | eugenis | 2015-07-19 12:57:13 -0700 (Sun, 19 Jul 2015) | 5 lines

[sanitizer] De-flake one test.

signal_segv_handler.cc occasionally fails due to a suspected kernel bug.
Increasing the mapped region size seems to make the test pass reliably.
------------------------------------------------------------------------

------------------------------------------------------------------------
r242651 | dvyukov | 2015-07-19 14:44:49 -0700 (Sun, 19 Jul 2015) | 6 lines

asan: fix a test

Page size is not necessary 4096.
Use sysconf to obtain page size.
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_37/   (props changed)
    compiler-rt/branches/release_37/test/sanitizer_common/TestCases/Linux/signal_segv_handler.cc

Propchange: compiler-rt/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 21 17:46:35 2015
@@ -1 +1 @@
-/compiler-rt/trunk:242350,242424,242444,242449
+/compiler-rt/trunk:242350,242424,242444,242449,242647,242651

Modified: compiler-rt/branches/release_37/test/sanitizer_common/TestCases/Linux/signal_segv_handler.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_37/test/sanitizer_common/TestCases/Linux/signal_segv_handler.cc?rev=242848&r1=242847&r2=242848&view=diff
==============================================================================
--- compiler-rt/branches/release_37/test/sanitizer_common/TestCases/Linux/signal_segv_handler.cc (original)
+++ compiler-rt/branches/release_37/test/sanitizer_common/TestCases/Linux/signal_segv_handler.cc Tue Jul 21 17:46:35 2015
@@ -18,23 +18,27 @@
 #include <signal.h>
 #include <sys/mman.h>
 #include <string.h>
+#include <unistd.h>
 
+unsigned long page_size;
 void *guard;
 
 void handler(int signo, siginfo_t *info, void *uctx) {
-  mprotect(guard, 4096, PROT_READ | PROT_WRITE);
+  mprotect(guard, page_size, PROT_READ | PROT_WRITE);
 }
 
 int main() {
+  page_size = sysconf(_SC_PAGESIZE);
   struct sigaction a, old;
   memset(&a, 0, sizeof(a));
   memset(&old, 0, sizeof(old));
   a.sa_sigaction = handler;
   a.sa_flags = SA_SIGINFO;
   sigaction(SIGSEGV, &a, &old);
-  guard = mmap(0, 4096, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0);
+  guard = mmap(0, 3 * page_size, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0);
+  guard = (char*)guard + page_size;  // work around a kernel bug 
   for (int i = 0; i < 1000000; i++) {
-    mprotect(guard, 4096, PROT_NONE);
+    mprotect(guard, page_size, PROT_NONE);
     *(int*)guard = 1;
   }
   sigaction(SIGSEGV, &old, 0);