summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2016-12-28 21:57:51 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2016-12-28 21:57:51 +0000
commitc0e82d6bfce5e2fc9bc65ada9930f5099315b8aa (patch)
treefa50d623953b3eb11742ee885bcc1265aae94182
parent8369b28da0750129ababae357bea98940800a0e0 (diff)
downloadbcm5719-llvm-c0e82d6bfce5e2fc9bc65ada9930f5099315b8aa.tar.gz
bcm5719-llvm-c0e82d6bfce5e2fc9bc65ada9930f5099315b8aa.zip
Decrease kLargeMalloc block size in ASAN unit tests.
Summary: Make kLargeMalloc big enough to be handled by secondary allocator and small enough to fit into quarantine for all configurations. It become too big to fit into quarantine on Android after D27873. Reviewers: eugenis Patch by Alex Shlyapnikov. Subscribers: danalbert, llvm-commits, kubabrecka Differential Revision: https://reviews.llvm.org/D28142 llvm-svn: 290689
-rw-r--r--compiler-rt/lib/asan/tests/asan_test_utils.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler-rt/lib/asan/tests/asan_test_utils.h b/compiler-rt/lib/asan/tests/asan_test_utils.h
index 03d17cfb26a..f16d939c94a 100644
--- a/compiler-rt/lib/asan/tests/asan_test_utils.h
+++ b/compiler-rt/lib/asan/tests/asan_test_utils.h
@@ -62,7 +62,9 @@ typedef uint64_t U8;
static const int kPageSize = 4096;
-const size_t kLargeMalloc = 1 << 24;
+// Big enough to be handled by secondary allocator and small enough to fit into
+// quarantine for all configurations.
+const size_t kLargeMalloc = 1 << 22;
extern void free_aaa(void *p);
extern void *malloc_aaa(size_t size);
OpenPOWER on IntegriCloud