[msan] Print stats even on successful run with atexit=1.

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

3 files changed, 6 insertions, 4 deletions

diff --git a/lib/msan/msan.cc b/lib/msan/msan.cc
index 4c58200f1..bd5545fb4 100644
--- a/lib/msan/msan.cc
+++ b/lib/msan/msan.cc
@@ -144,6 +144,7 @@ static void ParseFlagsFromString(Flags *f, const char *str) {
   ParseFlag(str, &f->report_umrs, "report_umrs", "");
   ParseFlag(str, &f->wrap_signals, "wrap_signals", "");
   ParseFlag(str, &f->print_stats, "print_stats", "");
+  ParseFlag(str, &f->atexit, "atexit", "");
 
   // keep_going is an old name for halt_on_error,
   // and it has inverse meaning.
@@ -173,6 +174,7 @@ static void InitializeFlags(Flags *f, const char *options) {
   f->report_umrs = true;
   f->wrap_signals = true;
   f->print_stats = false;
+  f->atexit = false;
   f->halt_on_error = !&__msan_keep_going;
 
   // Override from user-specified string.
diff --git a/lib/msan/msan_flags.h b/lib/msan/msan_flags.h
index 47ac7e435..e9ea32bda 100644
--- a/lib/msan/msan_flags.h
+++ b/lib/msan/msan_flags.h
@@ -29,6 +29,7 @@ struct Flags {
   bool wrap_signals;
   bool print_stats;
   bool halt_on_error;
+  bool atexit;
 };
 
 Flags *flags();
diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
index 72f7c594b..a8fbabb01 100644
--- a/lib/msan/msan_linux.cc
+++ b/lib/msan/msan_linux.cc
@@ -90,12 +90,11 @@ void MsanDie() {
 }
 
 static void MsanAtExit(void) {
+  if (flags()->print_stats && (flags()->atexit || msan_report_count > 0))
+    ReportStats();
   if (msan_report_count > 0) {
     ReportAtExitStatistics();
-    if (flags()->print_stats)
-      ReportStats();
-    if (flags()->exit_code)
-      _exit(flags()->exit_code);
+    if (flags()->exit_code) _exit(flags()->exit_code);
   }
 }