[UBSan] Parse common flags from UBSAN_OPTIONS runtime variable even if

UBSan is combined with ASan.

llvm-svn: 217616

2 files changed, 9 insertions, 0 deletions

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_flags.cc b/compiler-rt/lib/sanitizer_common/sanitizer_flags.cc
index 881cc3e7faa..8482751ecae 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_flags.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_flags.cc
@@ -20,6 +20,7 @@
 namespace __sanitizer {
 
 CommonFlags common_flags_dont_use;
+bool common_flags_defaults_set = false;
 
 struct FlagDescription {
   const char *name;
@@ -35,6 +36,11 @@ IntrusiveList<FlagDescription> flag_descriptions;
 #endif
 
 void SetCommonFlagsDefaults(CommonFlags *f) {
+  CHECK_EQ(common_flags(), f);
+  if (common_flags_defaults_set)
+    return;
+  common_flags_defaults_set = true;
+
   f->symbolize = true;
   f->external_symbolizer_path = 0;
   f->allow_addr2line = false;
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_flags.h b/compiler-rt/lib/sanitizer_common/sanitizer_flags.h
index 97641a6c49f..256ca8ce847 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_flags.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_flags.h
@@ -67,7 +67,10 @@ inline CommonFlags *common_flags() {
   return &common_flags_dont_use;
 }
 
+// Sets default values for common flags. If called multiple times,
+// sets default values only once.
 void SetCommonFlagsDefaults(CommonFlags *f);
+
 void ParseCommonFlagsFromString(CommonFlags *f, const char *str);
 void PrintFlagDescriptions();