diff options
author | Alexey Samsonov <vonosmas@gmail.com> | 2015-02-12 00:36:42 +0000 |
---|---|---|
committer | Alexey Samsonov <vonosmas@gmail.com> | 2015-02-12 00:36:42 +0000 |
commit | a6995e967d5cad7f7fd42c03bff8ff40a3e37107 (patch) | |
tree | de87d31bcd235504a00b2763035df9c1f70baabe /lib/msan/msan.cc | |
parent | ce79127b8f3a761c1d584dc055c37780d0ef58cf (diff) |
[Sanitizer] Change InitializeFlags() signatures. NFC.
These functions are always used to initialize singleton flags(), as
well as other global data (common_flags()).
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@228894 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/msan/msan.cc')
-rw-r--r-- | lib/msan/msan.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/msan/msan.cc b/lib/msan/msan.cc index 31b705ea9..ed6efbdd6 100644 --- a/lib/msan/msan.cc +++ b/lib/msan/msan.cc @@ -120,7 +120,7 @@ class FlagHandlerKeepGoing : public FlagHandlerBase { } }; -void RegisterMsanFlags(FlagParser *parser, Flags *f) { +static void RegisterMsanFlags(FlagParser *parser, Flags *f) { #define MSAN_FLAG(Type, Name, DefaultValue, Description) \ RegisterFlag(parser, #Name, Description, &f->Name); #include "msan_flags.inc" @@ -132,7 +132,8 @@ void RegisterMsanFlags(FlagParser *parser, Flags *f) { "deprecated, use halt_on_error"); } -static void InitializeFlags(Flags *f, const char *options) { +static void InitializeFlags() { + Flags *f = flags(); FlagParser parser; RegisterMsanFlags(&parser, f); RegisterCommonFlags(&parser); @@ -156,7 +157,9 @@ static void InitializeFlags(Flags *f, const char *options) { if (__msan_default_options) parser.ParseString(__msan_default_options()); - parser.ParseString(options); + const char *msan_options = GetEnv("MSAN_OPTIONS"); + parser.ParseString(msan_options); + VPrintf(1, "MSAN_OPTIONS: %s\n", msan_options ? msan_options : "<empty>"); SetVerbosity(common_flags()->verbosity); @@ -351,8 +354,7 @@ void __msan_init() { SetDieCallback(MsanDie); InitTlsSize(); - const char *msan_options = GetEnv("MSAN_OPTIONS"); - InitializeFlags(&msan_flags, msan_options); + InitializeFlags(); __sanitizer_set_report_path(common_flags()->log_path); InitializeInterceptors(); @@ -369,8 +371,6 @@ void __msan_init() { ReExec(); } - VPrintf(1, "MSAN_OPTIONS: %s\n", msan_options ? msan_options : "<empty>"); - __msan_clear_on_return(); if (__msan_get_track_origins()) VPrintf(1, "msan_track_origins\n"); |