Require verbosity >= 1

Author: thurstond

compiler-rt/lib/msan/msan.cpp

@@ -372,18 +372,19 @@ static void print_shadow_value(void *shadow, u64 size) {
   Printf("\n");
 }
 
-#define MSAN_MAYBE_WARNING(type, size)              \
-  void __msan_maybe_warning_##size(type s, u32 o) { \
-    GET_CALLER_PC_BP;                               \
-                                                    \
-    if (UNLIKELY(s)) {                              \
-      PrintWarningWithOrigin(pc, bp, o);            \
-      print_shadow_value((void *)(&s), sizeof(s));  \
-      if (__msan::flags()->halt_on_error) {         \
-        Printf("Exiting\n");                        \
-        Die();                                      \
-      }                                             \
-    }                                               \
+#define MSAN_MAYBE_WARNING(type, size)               \
+  void __msan_maybe_warning_##size(type s, u32 o) {  \
+    GET_CALLER_PC_BP;                                \
+                                                     \
+    if (UNLIKELY(s)) {                               \
+      PrintWarningWithOrigin(pc, bp, o);             \
+      if (Verbosity() >= 1)                          \
+        print_shadow_value((void *)(&s), sizeof(s)); \
+      if (__msan::flags()->halt_on_error) {          \
+        Printf("Exiting\n");                         \
+        Die();                                       \
+      }                                              \
+    }                                                \
   }
 
 MSAN_MAYBE_WARNING(u8, 1)
@@ -406,7 +407,8 @@ void __msan_maybe_warning_N(void *shadow, u64 size, u32 o) {
 
   if (UNLIKELY(!allZero)) {
     PrintWarningWithOrigin(pc, bp, o);
-    print_shadow_value(shadow, size);
+    if (Verbosity() >= 1)
+      print_shadow_value(shadow, size);
     if (__msan::flags()->halt_on_error) {
       Printf("Exiting\n");
       Die();

compiler-rt/test/msan/msan_print_shadow_on_outlined_check.cpp

@@ -1,5 +1,5 @@
 // RUN: %clangxx_msan -fsanitize-recover=memory -mllvm -msan-instrumentation-with-call-threshold=0 -g %s -o %t \
-// RUN:   && not %run %t 2>&1 | FileCheck %s
+// RUN:   && not env MSAN_OPTIONS=verbosity=1 %run %t 2>&1 | FileCheck %s
 
 #include <ctype.h>
 #include <stdio.h>