1 files changed, 4 insertions, 6 deletions

diff --git a/lib/msan/msan.cc b/lib/msan/msan.cc
index aebbd052b..4b4f7d47f 100644
--- a/lib/msan/msan.cc
+++ b/lib/msan/msan.cc
@@ -129,7 +129,6 @@ static void ParseFlagsFromString(Flags *f, const char *str) {
     Die();
   }
   ParseFlag(str, &f->report_umrs, "report_umrs");
-  ParseFlag(str, &f->verbosity, "verbosity");
   ParseFlag(str, &f->wrap_signals, "wrap_signals");
 
   // keep_going is an old name for halt_on_error,
@@ -157,7 +156,6 @@ static void InitializeFlags(Flags *f, const char *options) {
   f->poison_in_free = true;
   f->exit_code = 77;
   f->report_umrs = true;
-  f->verbosity = 0;
   f->wrap_signals = true;
   f->halt_on_error = !&__msan_keep_going;
 
@@ -304,7 +302,7 @@ void __msan_init() {
   InitializeFlags(&msan_flags, msan_options);
   __sanitizer_set_report_path(common_flags()->log_path);
   if (StackSizeIsUnlimited()) {
-    if (flags()->verbosity)
+    if (common_flags()->verbosity)
       Printf("Unlimited stack, doing reexec\n");
     // A reasonably large stack size. It is bigger than the usual 8Mb, because,
     // well, the program could have been run with unlimited stack for a reason.
@@ -312,12 +310,12 @@ void __msan_init() {
     ReExec();
   }
 
-  if (flags()->verbosity)
+  if (common_flags()->verbosity)
     Printf("MSAN_OPTIONS: %s\n", msan_options ? msan_options : "<empty>");
 
   msan_running_under_dr = IsRunningUnderDr();
   __msan_clear_on_return();
-  if (__msan_get_track_origins() && flags()->verbosity > 0)
+  if (__msan_get_track_origins() && common_flags()->verbosity > 0)
     Printf("msan_track_origins\n");
   if (!InitShadow(/* prot1 */ false, /* prot2 */ true, /* map_shadow */ true,
                   __msan_get_track_origins())) {
@@ -341,7 +339,7 @@ void __msan_init() {
   GetThreadStackTopAndBottom(/* at_initialization */true,
                              &__msan_stack_bounds.stack_top,
                              &__msan_stack_bounds.stack_bottom);
-  if (flags()->verbosity)
+  if (common_flags()->verbosity)
     Printf("MemorySanitizer init done\n");
   msan_init_is_running = 0;
   msan_inited = 1;