Move SanitizerToolName definition before MaybeMountProcFS.

The MaybeMountProcFS uses SanitizerToolName in its failure messages so we
need it defined at this point.

Change-Id: I6a568e1ebf3d646ecfbdb53fd8e48910e9b66559
Signed-off-by: Maxim Ostapenko <m.ostapenko@samsung.com>

diff --git a/libsanitizer/asan/asan_rtl.cc b/libsanitizer/asan/asan_rtl.cc
index d4dfc1d..7b5a101 100644 (file)
--- a/libsanitizer/asan/asan_rtl.cc
+++ b/libsanitizer/asan/asan_rtl.cc
@@ -407,9 +407,9 @@ static void MaybeDisableUlimit() {
 
 static void AsanInitInternal() {
   if (LIKELY(asan_inited)) return;
+  SanitizerToolName = "AddressSanitizer";
   MaybeMountProcFS();
   MaybeDisableUlimit();
-  SanitizerToolName = "AddressSanitizer";
   CHECK(!asan_init_is_running && "ASan init calls itself!");
   asan_init_is_running = true;
 

diff --git a/libsanitizer/lsan/lsan.cc b/libsanitizer/lsan/lsan.cc
index 8d20bb6..33051ce 100644 (file)
--- a/libsanitizer/lsan/lsan.cc
+++ b/libsanitizer/lsan/lsan.cc
@@ -88,9 +88,9 @@ extern "C" void __lsan_init() {
   CHECK(!lsan_init_is_running);
   if (LIKELY(lsan_inited))
     return;
+  SanitizerToolName = "LeakSanitizer";
   MaybeMountProcFS();
   lsan_init_is_running = true;
-  SanitizerToolName = "LeakSanitizer";
   CacheBinaryName();
   InitializeFlags();
   InitCommonLsan();