From 583e9d29ad1af1777b8eafeef48576ac1da2a7be Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Fri, 19 Dec 2014 19:16:02 +0000 Subject: [PATCH] [ASan] Move flag validation from ParseFlagsFromString() to InitializeFlags(). llvm-svn: 224600 --- compiler-rt/lib/asan/asan_flags.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler-rt/lib/asan/asan_flags.cc b/compiler-rt/lib/asan/asan_flags.cc index 63faeb0..a478006 100644 --- a/compiler-rt/lib/asan/asan_flags.cc +++ b/compiler-rt/lib/asan/asan_flags.cc @@ -50,11 +50,6 @@ void ParseFlagsFromString(Flags *f, const char *str) { "Requirement: redzone >= 16, is a power of two."); ParseFlag(str, &f->max_redzone, "max_redzone", "Maximal size (in bytes) of redzones around heap objects."); - CHECK_GE(f->redzone, 16); - CHECK_GE(f->max_redzone, f->redzone); - CHECK_LE(f->max_redzone, 2048); - CHECK(IsPowerOfTwo(f->redzone)); - CHECK(IsPowerOfTwo(f->max_redzone)); ParseFlag(str, &f->debug, "debug", "If set, prints some debugging information and does additional checks."); @@ -285,6 +280,11 @@ void InitializeFlags(Flags *f) { } CHECK_LE((uptr)cf->malloc_context_size, kStackTraceMax); CHECK_LE(f->min_uar_stack_size_log, f->max_uar_stack_size_log); + CHECK_GE(f->redzone, 16); + CHECK_GE(f->max_redzone, f->redzone); + CHECK_LE(f->max_redzone, 2048); + CHECK(IsPowerOfTwo(f->redzone)); + CHECK(IsPowerOfTwo(f->max_redzone)); } } // namespace __asan -- 2.7.4