5 files changed, 7 insertions, 10 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;
diff --git a/lib/msan/msan_flags.h b/lib/msan/msan_flags.h
index 318ea7cf4..93fa8a60d 100644
--- a/lib/msan/msan_flags.h
+++ b/lib/msan/msan_flags.h
@@ -19,7 +19,6 @@ namespace __msan {
 // Flags.
 struct Flags {
   int exit_code;
-  int verbosity;
   bool poison_heap_with_zeroes;  // default: false
   bool poison_stack_with_zeroes;  // default: false
   bool poison_in_malloc;  // default: true
diff --git a/lib/msan/msan_interceptors.cc b/lib/msan/msan_interceptors.cc
index 932d58f4b..308615430 100644
--- a/lib/msan/msan_interceptors.cc
+++ b/lib/msan/msan_interceptors.cc
@@ -1082,7 +1082,7 @@ INTERCEPTOR(int, pthread_create, void *th, void *attr, void *(*callback)(void*),
     attr = &myattr;
   }
 
-  AdjustStackSizeLinux(attr, flags()->verbosity);
+  AdjustStackSizeLinux(attr, common_flags()->verbosity);
 
   int res = REAL(pthread_create)(th, attr, callback, param);
   if (attr == &myattr)
diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
index b82ed8ce8..ff5fc735b 100644
--- a/lib/msan/msan_linux.cc
+++ b/lib/msan/msan_linux.cc
@@ -45,7 +45,7 @@ static const uptr kOriginsBeg = kBad2Beg;
 static const uptr kOriginsEnd = kBad2End;
 
 bool InitShadow(bool prot1, bool prot2, bool map_shadow, bool init_origins) {
-  if (flags()->verbosity) {
+  if (common_flags()->verbosity) {
     Printf("__msan_init %p\n", &__msan_init);
     Printf("Memory   : %p %p\n", kMemBeg, kMemEnd);
     Printf("Bad2     : %p %p\n", kBad2Beg, kBad2End);
diff --git a/lib/msan/msan_report.cc b/lib/msan/msan_report.cc
index 997959ef0..7b5a914fa 100644
--- a/lib/msan/msan_report.cc
+++ b/lib/msan/msan_report.cc
@@ -41,7 +41,7 @@ static void PrintStack(const uptr *trace, uptr size) {
 
 static void DescribeOrigin(u32 origin) {
   Decorator d;
-  if (flags()->verbosity)
+  if (common_flags()->verbosity)
     Printf("  raw origin id: %d\n", origin);
   uptr pc;
   if (const char *so = GetOriginDescrIfStack(origin, &pc)) {