From fc95c85cb5b101466ba568bdac604c03e5f27095 Mon Sep 17 00:00:00 2001
From: Alexey Samsonov <vonosmas@gmail.com>
Date: Fri, 21 Aug 2015 23:00:30 +0000
Subject: [PATCH] [LSan] Support __sanitizer_set_death_callback in standalone
 LSan.

llvm-svn: 245758
---
 compiler-rt/lib/lsan/lsan_common.cc                             | 2 +-
 .../TestCases/Linux/sanitizer_set_death_callback_test.cc        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/compiler-rt/lib/lsan/lsan_common.cc b/compiler-rt/lib/lsan/lsan_common.cc
index 46daefeeba31..243dd55bb2b2 100644
--- a/compiler-rt/lib/lsan/lsan_common.cc
+++ b/compiler-rt/lib/lsan/lsan_common.cc
@@ -447,7 +447,7 @@ void DoLeakCheck() {
   if (common_flags()->exitcode) {
     if (common_flags()->coverage)
       __sanitizer_cov_dump();
-    internal__exit(common_flags()->exitcode);
+    Die();
   }
 }
 
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/sanitizer_set_death_callback_test.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/sanitizer_set_death_callback_test.cc
index ee3d59c72172..91e82d31083a 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/sanitizer_set_death_callback_test.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/sanitizer_set_death_callback_test.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx -O2 %s -o %t && not %run %t 2>&1 | FileCheck %s
 // Check __sanitizer_set_death_callback. Not all sanitizers implement it yet.
-// XFAIL: lsan
 // XFAIL: tsan
 
 #include <sanitizer/common_interface_defs.h>