From 85e62e6d13b1310199508049554849d00f222cbe Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Thu, 3 Dec 2020 09:53:42 +0100 Subject: [PATCH] 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 Reviewed-by: Tommi Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#32772} --- rtc_base/system/BUILD.gn | 1 + rtc_base/system/no_unique_address.h | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rtc_base/system/BUILD.gn b/rtc_base/system/BUILD.gn index 9f83c629e2..385f2e1d84 100644 --- a/rtc_base/system/BUILD.gn +++ b/rtc_base/system/BUILD.gn @@ -57,6 +57,7 @@ rtc_source_set("rtc_export") { rtc_source_set("no_unique_address") { sources = [ "no_unique_address.h" ] + deps = [ "..:sanitizer" ] } if (is_mac || is_ios) { diff --git a/rtc_base/system/no_unique_address.h b/rtc_base/system/no_unique_address.h index 403f2b8fb2..eca349c0cc 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)