commit 85e62e6d13b1310199508049554849d00f222cbe
author Mirko Bonadei <mbonadei@webrtc.org> Thu Dec 03 08:53:42 2020
committer Commit Bot <commit-bot@chromium.org> Fri Dec 04 10:38:03 2020
tree 8b77d71a2fb5fe0ecd537f5aff52d5fdf5fef98b
parent ad70609509a98138cd6391828e4adafeb2f35b3d

Use RTC_HAS_MSAN to check for MSan builds.

Bug: None
Change-Id: Iba1d66d9985f449c5d3710d7d615d4b25acf763b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196360
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Reviewed-by: Tommi <tommi@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32772}

rtc_base/system/BUILD.gn

diff --git a/rtc_base/system/BUILD.gn b/rtc_base/system/BUILD.gn
index 9f83c62..385f2e1 100644
--- a/rtc_base/system/BUILD.gn
+++ b/rtc_base/system/BUILD.gn
@@ -57,6 +57,7 @@
 
 rtc_source_set("no_unique_address") {
   sources = [ "no_unique_address.h" ]
+  deps = [ "..:sanitizer" ]
 }
 
 if (is_mac || is_ios) {

rtc_base/system/no_unique_address.h

diff --git a/rtc_base/system/no_unique_address.h b/rtc_base/system/no_unique_address.h
index 403f2b8..eca349c 100644
--- a/rtc_base/system/no_unique_address.h
+++ b/rtc_base/system/no_unique_address.h
@@ -11,6 +11,8 @@
 #ifndef RTC_BASE_SYSTEM_NO_UNIQUE_ADDRESS_H_
 #define RTC_BASE_SYSTEM_NO_UNIQUE_ADDRESS_H_
 
+#include "rtc_base/sanitizer.h"
+
 // RTC_NO_UNIQUE_ADDRESS is a portable annotation to tell the compiler that
 // a data member need not have an address distinct from all other non-static
 // data members of its class.
@@ -26,7 +28,7 @@
 // platform is iOS.
 //
 // TODO(bugs.webrtc.org/12218): Re-enable on MSan builds.
-#if !defined(__SANITIZE_MEMORY__) &&                                       \
+#if !RTC_HAS_MSAN &&                                                       \
     ((defined(__clang__) && !defined(_MSC_VER) && !defined(WEBRTC_IOS)) || \
      __cplusplus > 201703L)
 // NOLINTNEXTLINE(whitespace/braces)