Revert r224736: "[Sanitizer] Make CommonFlags immutable after initialization."

We've got some internal users that either aren't compatible with this or
have found a bug with it. Either way, this is an isolated cleanup and so
I'm reverting it to un-block folks while we investigate. Alexey and
I will be working on fixing everything up so this can be re-committed
soon. Sorry for the noise and any inconvenience.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@225079 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 3 insertions, 6 deletions

diff --git a/lib/tsan/dd/dd_rtl.cc b/lib/tsan/dd/dd_rtl.cc
index 3fd893dfb..cc8e5a0c4 100644
--- a/lib/tsan/dd/dd_rtl.cc
+++ b/lib/tsan/dd/dd_rtl.cc
@@ -70,13 +70,10 @@ void InitializeFlags(Flags *f, const char *env) {
   // Default values.
   f->second_deadlock_stack = false;
 
+  CommonFlags *cf = common_flags();
   SetCommonFlagsDefaults();
-  {
-    // Override some common flags defaults.
-    CommonFlags cf = *common_flags();
-    cf.allow_addr2line = true;
-    OverrideCommonFlags(cf);
-  }
+  // Override some common flags defaults.
+  cf->allow_addr2line = true;
 
   // Override from command line.
   ParseFlag(env, &f->second_deadlock_stack, "second_deadlock_stack", "");