diff options
| author | Alexey Samsonov <vonosmas@gmail.com> | 2014-09-11 18:20:11 +0000 |
|---|---|---|
| committer | Alexey Samsonov <vonosmas@gmail.com> | 2014-09-11 18:20:11 +0000 |
| commit | 3451762a4db1036b0576cbaa9d1a1309b981a634 (patch) | |
| tree | d457304501d4d32dd7b940164775841c6e963e3f /lib/ubsan/ubsan_flags.cc | |
| parent | cc6a14da1bb23233c0fa2c83b72587a1279bd4ca (diff) | |
[UBSan] Parse common flags from UBSAN_OPTIONS runtime variable even if
UBSan is combined with ASan.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@217616 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ubsan/ubsan_flags.cc')
| -rw-r--r-- | lib/ubsan/ubsan_flags.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ubsan/ubsan_flags.cc b/lib/ubsan/ubsan_flags.cc index 843f9a6c5..ae15fd389 100644 --- a/lib/ubsan/ubsan_flags.cc +++ b/lib/ubsan/ubsan_flags.cc @@ -28,7 +28,7 @@ static const char *GetRuntimeFlagsFromCompileDefinition() { #endif } -void InitializeCommonFlags() { +static void InitializeCommonFlags() { CommonFlags *cf = common_flags(); SetCommonFlagsDefaults(cf); cf->print_summary = false; @@ -50,6 +50,7 @@ static void ParseFlagsFromString(Flags *f, const char *str) { } void InitializeFlags() { + InitializeCommonFlags(); Flags *f = flags(); // Default values. f->halt_on_error = false; |