From f89eb650a59af9952fa9161460aa124a5400bc06 Mon Sep 17 00:00:00 2001
From: Kostya Serebryany <kcc@google.com>
Date: Wed, 3 Dec 2014 23:29:14 +0000
Subject: [msan] allow -fsanitize-coverage=N together with -fsanitize=memory,
 compiler-rt part

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@223314 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/msan/msan.cc       | 5 +++++
 lib/msan/msan_linux.cc | 2 ++
 2 files changed, 7 insertions(+)

(limited to 'lib/msan')

diff --git a/lib/msan/msan.cc b/lib/msan/msan.cc
index af42176c2..853e448fa 100644
--- a/lib/msan/msan.cc
+++ b/lib/msan/msan.cc
@@ -372,6 +372,11 @@ void __msan_init() {
 
   Symbolizer::GetOrInit()->AddHooks(EnterSymbolizer, ExitSymbolizer);
 
+  if (common_flags()->coverage) {
+    __sanitizer_cov_init();
+    Atexit(__sanitizer_cov_dump);
+  }
+
   MsanTSDInit(MsanTSDDtor);
 
   MsanThread *main_thread = MsanThread::Create(0, 0);
diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
index 29acfc43c..0b67b531d 100644
--- a/lib/msan/msan_linux.cc
+++ b/lib/msan/msan_linux.cc
@@ -133,6 +133,8 @@ bool InitShadow(bool map_shadow, bool init_origins) {
 }
 
 void MsanDie() {
+  if (common_flags()->coverage)
+    __sanitizer_cov_dump();
   if (death_callback)
     death_callback();
   _exit(flags()->exit_code);
-- 
cgit v1.2.3