1 files changed, 7 insertions, 11 deletions
diff --git a/lib/tsan/rtl/tsan_flags.cc b/lib/tsan/rtl/tsan_flags.cc
index 70fa1808a..ec74a24b0 100644
--- a/lib/tsan/rtl/tsan_flags.cc
+++ b/lib/tsan/rtl/tsan_flags.cc
@@ -93,16 +93,13 @@ void InitializeFlags(Flags *f, const char *env) {
   // DDFlags
   f->second_deadlock_stack = false;
 
+  CommonFlags *cf = common_flags();
   SetCommonFlagsDefaults();
-  {
-    // Override some common flags defaults.
-    CommonFlags cf = *common_flags();
-    cf.allow_addr2line = true;
-    cf.detect_deadlocks = true;
-    cf.print_suppressions = false;
-    cf.stack_trace_format = "    #%n %f %S %M";
-    OverrideCommonFlags(cf);
-  }
+  // Override some common flags defaults.
+  cf->allow_addr2line = true;
+  cf->detect_deadlocks = true;
+  cf->print_suppressions = false;
+  cf->stack_trace_format = "    #%n %f %S %M";
 
   // Let a frontend override.
   ParseFlags(f, __tsan_default_options());
@@ -118,8 +115,7 @@ void InitializeFlags(Flags *f, const char *env) {
     f->report_signal_unsafe = false;
   }
 
-  if (common_flags()->help)
-    PrintFlagDescriptions();
+  if (cf->help) PrintFlagDescriptions();
 
   if (f->history_size < 0 || f->history_size > 7) {
     Printf("ThreadSanitizer: incorrect value for history_size"