New upstream version 1.12.0+dfsg1

[rustc.git] / src / compiler-rt / lib / asan / asan_activation.cc

diff --git a/src/compiler-rt/lib/asan/asan_activation.cc b/src/compiler-rt/lib/asan/asan_activation.cc
index 9df3b977ea1ba9b431826242775f77013208d1e0..a5ace85038a639b74cfe2234ad6cbb223282b3c4 100644 (file)
--- a/src/compiler-rt/lib/asan/asan_activation.cc
+++ b/src/compiler-rt/lib/asan/asan_activation.cc
@@ -47,6 +47,7 @@ static struct AsanDeactivatedFlags {
     FlagParser parser;
     RegisterActivationFlags(&parser, &f, &cf);
 
+    cf.SetDefaults();
     // Copy the current activation flags.
     allocator_options.CopyTo(&f, &cf);
     cf.malloc_context_size = malloc_context_size;
@@ -61,7 +62,7 @@ static struct AsanDeactivatedFlags {
       parser.ParseString(env);
     }
 
-    SetVerbosity(cf.verbosity);
+    InitializeCommonFlags(&cf);
 
     if (Verbosity()) ReportUnrecognizedFlags();