[DD] Don't store the second copy of CommonFlags inside DDFlags.
llvm-svn: 223909
diff --git a/compiler-rt/lib/tsan/dd/dd_rtl.cc b/compiler-rt/lib/tsan/dd/dd_rtl.cc
index 44de617..41b75bf 100644
--- a/compiler-rt/lib/tsan/dd/dd_rtl.cc
+++ b/compiler-rt/lib/tsan/dd/dd_rtl.cc
@@ -70,16 +70,14 @@
// Default values.
f->second_deadlock_stack = false;
- SetCommonFlagsDefaults(f);
+ CommonFlags *cf = common_flags();
+ SetCommonFlagsDefaults(cf);
// Override some common flags defaults.
- f->allow_addr2line = true;
+ cf->allow_addr2line = true;
// Override from command line.
ParseFlag(env, &f->second_deadlock_stack, "second_deadlock_stack", "");
- ParseCommonFlagsFromString(f, env);
-
- // Copy back to common flags.
- *common_flags() = *f;
+ ParseCommonFlagsFromString(cf, env);
}
void Initialize() {
@@ -88,7 +86,6 @@
InitializeInterceptors();
InitializeFlags(flags(), GetEnv("DSAN_OPTIONS"));
- common_flags()->symbolize = true;
ctx->dd = DDetector::Create(flags());
}