[compiler-rt] r355250 - Revert "[sanitizers] Don't use Windows Trace Logging on MinGW"

[Vlad Tsyrklevich via llvm-commits]

Author: vlad.tsyrklevich
Date: Fri Mar  1 16:39:36 2019
New Revision: 355250

URL: http://llvm.org/viewvc/llvm-project?rev=355250&view=rev
Log:
Revert "[sanitizers] Don't use Windows Trace Logging on MinGW"

This reverts commits r355236 and r355244, they broke the Linux sanitizer
build.

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_win.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h?rev=355250&r1=355249&r2=355250&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h Fri Mar  1 16:39:36 2019
@@ -804,13 +804,7 @@ enum AndroidApiLevel {
 
 void WriteToSyslog(const char *buffer);
 
-#if defined(SANITIZER_WINDOWS) && defined(_MSC_VER)
-#define SANITIZER_WIN_TRACE 1
-#else
-#define SANITIZER_WIN_TRACE 0
-#endif
-
-#if SANITIZER_MAC || SANITIZER_WIN_TRACE
+#if SANITIZER_MAC || SANITIZER_WINDOWS
 void LogFullErrorReport(const char *buffer);
 #else
 INLINE void LogFullErrorReport(const char *buffer) {}
@@ -824,7 +818,7 @@ INLINE void WriteOneLineToSyslog(const c
 INLINE void LogMessageOnPrintf(const char *str) {}
 #endif
 
-#if SANITIZER_LINUX || SANITIZER_WIN_TRACE
+#if SANITIZER_LINUX || SANITIZER_WINDOWS
 // Initialize Android logging. Any writes before this are silently lost.
 void AndroidLogInit();
 void SetAbortMessage(const char *);

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_win.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_win.cc?rev=355250&r1=355249&r2=355250&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_win.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_win.cc Fri Mar  1 16:39:36 2019
@@ -20,6 +20,7 @@
 #include <io.h>
 #include <psapi.h>
 #include <stdlib.h>
+#include <TraceLoggingProvider.h>
 
 #include "sanitizer_common.h"
 #include "sanitizer_file.h"
@@ -31,8 +32,6 @@
 #if defined(PSAPI_VERSION) && PSAPI_VERSION == 1
 #pragma comment(lib, "psapi")
 #endif
-#if SANITIZER_WIN_TRACE
-#include <traceloggingprovider.h>
 //  Windows trace logging provider init
 #pragma comment(lib, "advapi32.lib")
 TRACELOGGING_DECLARE_PROVIDER(g_asan_provider);
@@ -40,9 +39,6 @@ TRACELOGGING_DECLARE_PROVIDER(g_asan_pro
 TRACELOGGING_DEFINE_PROVIDER(g_asan_provider, "AddressSanitizerLoggingProvider",
                              (0x6c6c766d, 0x3846, 0x4e6a, 0xa4, 0xfb, 0x5b,
                               0x53, 0x0b, 0xd0, 0xf3, 0xfa));
-#else
-#define TraceLoggingUnregister(x)
-#endif
 
 // A macro to tell the compiler that this part of the code cannot be reached,
 // if the compiler supports this feature. Since we're using this in
@@ -1084,7 +1080,6 @@ u32 GetNumberOfCPUs() {
   return sysinfo.dwNumberOfProcessors;
 }
 
-#if SANITIZER_WIN_TRACE
 // TODO(mcgov): Rename this project-wide to PlatformLogInit
 void AndroidLogInit(void) {
   HRESULT hr = TraceLoggingRegister(g_asan_provider);
@@ -1108,7 +1103,6 @@ void LogFullErrorReport(const char *buff
                       TraceLoggingValue(buffer, "AsanReportContents"));
   }
 }
-#endif // SANITIZER_WIN_TRACE
 
 }  // namespace __sanitizer