[compiler-rt] 076d351 - [compiler-rt] [ubsan] Use the itanium type info lookup for mingw targets

[Martin Storsjö via llvm-commits]

Author: Martin Storsjö
Date: 2020-11-03T09:59:08+02:00
New Revision: 076d351e8bdd98fdcc7291c437be82d1a8480d11

URL: https://github.com/llvm/llvm-project/commit/076d351e8bdd98fdcc7291c437be82d1a8480d11
DIFF: https://github.com/llvm/llvm-project/commit/076d351e8bdd98fdcc7291c437be82d1a8480d11.diff

LOG: [compiler-rt] [ubsan] Use the itanium type info lookup for mingw targets

Differential Revision: https://reviews.llvm.org/D90571

Added: 
    

Modified: 
    compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cpp
    compiler-rt/lib/ubsan/ubsan_type_hash_win.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cpp b/compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cpp
index 4f1708ba1901..d82b542a020e 100644
--- a/compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cpp
+++ b/compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cpp
@@ -12,7 +12,7 @@
 
 #include "sanitizer_common/sanitizer_platform.h"
 #include "ubsan_platform.h"
-#if CAN_SANITIZE_UB && !SANITIZER_WINDOWS
+#if CAN_SANITIZE_UB && !defined(_MSC_VER)
 #include "ubsan_type_hash.h"
 
 #include "sanitizer_common/sanitizer_common.h"

diff  --git a/compiler-rt/lib/ubsan/ubsan_type_hash_win.cpp b/compiler-rt/lib/ubsan/ubsan_type_hash_win.cpp
index 45dcb758ec44..106fa1b85a55 100644
--- a/compiler-rt/lib/ubsan/ubsan_type_hash_win.cpp
+++ b/compiler-rt/lib/ubsan/ubsan_type_hash_win.cpp
@@ -12,7 +12,7 @@
 
 #include "sanitizer_common/sanitizer_platform.h"
 #include "ubsan_platform.h"
-#if CAN_SANITIZE_UB && SANITIZER_WINDOWS
+#if CAN_SANITIZE_UB && defined(_MSC_VER)
 #include "ubsan_type_hash.h"
 
 #include "sanitizer_common/sanitizer_common.h"