zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use RTC_HAS_MSAN to check for MSan builds.

Browse Source 
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}
This commit is contained in:
Mirko Bonadei
2020-12-03 09:53:42 +01:00
committed by Commit Bot
parent ad70609509
commit 85e62e6d13
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtc_base/system/BUILD.gn
View File

@ -57,6 +57,7 @@ rtc_source_set("rtc_export") {
rtc_source_set("no_unique_address") { rtc_source_set("no_unique_address") {
sources = [ "no_unique_address.h" ] sources = [ "no_unique_address.h" ]
deps = [ "..:sanitizer" ]
} }
if (is_mac || is_ios) { if (is_mac || is_ios) {

4
rtc_base/system/no_unique_address.h
View File

@ -11,6 +11,8 @@
#ifndef RTC_BASE_SYSTEM_NO_UNIQUE_ADDRESS_H_ #ifndef RTC_BASE_SYSTEM_NO_UNIQUE_ADDRESS_H_
#define 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 // 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 // a data member need not have an address distinct from all other non-static
// data members of its class. // data members of its class.
@ -26,7 +28,7 @@
// platform is iOS. // platform is iOS.
// //
// TODO(bugs.webrtc.org/12218): Re-enable on MSan builds. // 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)) || \ ((defined(__clang__) && !defined(_MSC_VER) && !defined(WEBRTC_IOS)) || \
__cplusplus > 201703L) __cplusplus > 201703L)
// NOLINTNEXTLINE(whitespace/braces) // NOLINTNEXTLINE(whitespace/braces)