Use ADDRESS_SANITIZER instead of __has_feature(address_sanitizer)

__has_feature() is a Clang-ism not implemented by GCC.
base/compiler_specific.h provides a HAS_FEATURE() macro that always
returns 0 when __has_feature() is not implemented. Use this macro for
compatibility with GCC and other compilers that do not implement this
Clang extension.

http://clang.llvm.org/docs/LanguageExtensions.html#has-feature-and-has-extension

For GCC’s Address Sanitizer implementation, test the
__SANITIZE_ADDRESS__ macro that it provides as an alternative to
__has_feature(address_sanitizer).

Note that in Chrome builds, ADDRESS_SANITIZER is pushed in by the build
system. The definition of ADDRESS_SANITIZER provides another way for
that macro to be set. It’s supplementary, not exclusive.

cb33b24372/build/config/BUILD.gn (118)

BUG=crashpad:30

Change-Id: I5c3145d29bbc966925369c03a37b1ecb5622a004
Reviewed-on: https://chromium-review.googlesource.com/413109
Reviewed-by: Robert Sesek <rsesek@chromium.org>
This commit is contained in:
Mark Mentovai 2016-11-22 14:27:51 -05:00
parent 68095b6a4e
commit 777634b1eb
4 changed files with 36 additions and 4 deletions

View File

@ -21,6 +21,7 @@
#include "build/build_config.h" #include "build/build_config.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "util/misc/address_sanitizer.h"
#include "util/misc/implicit_cast.h" #include "util/misc/implicit_cast.h"
namespace crashpad { namespace crashpad {
@ -103,13 +104,14 @@ void TestCaptureContext() {
// captured program counter should be slightly greater than or equal to the // captured program counter should be slightly greater than or equal to the
// reference program counter. // reference program counter.
uintptr_t pc = ProgramCounterFromContext(context_1); uintptr_t pc = ProgramCounterFromContext(context_1);
#if !__has_feature(address_sanitizer)
#if !defined(ADDRESS_SANITIZER)
// AddressSanitizer can cause enough code bloat that the “nearby” check would // AddressSanitizer can cause enough code bloat that the “nearby” check would
// likely fail. // likely fail.
const uintptr_t kReferencePC = const uintptr_t kReferencePC =
reinterpret_cast<uintptr_t>(TestCaptureContext); reinterpret_cast<uintptr_t>(TestCaptureContext);
EXPECT_LT(pc - kReferencePC, 64u); EXPECT_LT(pc - kReferencePC, 64u);
#endif #endif // !defined(ADDRESS_SANITIZER)
// Declare sp and context_2 here because all local variables need to be // Declare sp and context_2 here because all local variables need to be
// declared before computing the stack pointer reference value, so that the // declared before computing the stack pointer reference value, so that the

View File

@ -14,6 +14,7 @@
#include "client/crashpad_info.h" #include "client/crashpad_info.h"
#include "util/misc/address_sanitizer.h"
#include "util/stdlib/cxx.h" #include "util/stdlib/cxx.h"
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
@ -72,14 +73,14 @@ __attribute__((
#error Port #error Port
#endif // !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_ANDROID) #endif // !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_ANDROID)
#if __has_feature(address_sanitizer) #if defined(ADDRESS_SANITIZER)
// AddressSanitizer would add a trailing red zone of at least 32 bytes, // AddressSanitizer would add a trailing red zone of at least 32 bytes,
// which would be reflected in the size of the custom section. This confuses // which would be reflected in the size of the custom section. This confuses
// MachOImageReader::GetCrashpadInfo(), which finds that the sections size // MachOImageReader::GetCrashpadInfo(), which finds that the sections size
// disagrees with the structures size_ field. By specifying an alignment // disagrees with the structures size_ field. By specifying an alignment
// greater than the red zone size, the red zone will be suppressed. // greater than the red zone size, the red zone will be suppressed.
aligned(64), aligned(64),
#endif // __has_feature(address_sanitizer) #endif // defined(ADDRESS_SANITIZER)
// The “used” attribute prevents the structure from being dead-stripped. // The “used” attribute prevents the structure from being dead-stripped.
used, used,

View File

@ -0,0 +1,28 @@
// Copyright 2016 The Crashpad Authors. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef CRASHPAD_UTIL_MISC_ADDRESS_SANITIZER_H_
#define CRASHPAD_UTIL_MISC_ADDRESS_SANITIZER_H_
#include "base/compiler_specific.h"
#include "build/build_config.h"
#if !defined(ADDRESS_SANITIZER)
#if HAS_FEATURE(address_sanitizer) || \
(defined(COMPILER_GCC) && defined(__SANITIZE_ADDRESS__))
#define ADDRESS_SANITIZER 1
#endif
#endif // !defined(ADDRESS_SANITIZER)
#endif // CRASHPAD_UTIL_MISC_ADDRESS_SANITIZER_H_

View File

@ -84,6 +84,7 @@
'mach/task_for_pid.h', 'mach/task_for_pid.h',
'mach/task_memory.cc', 'mach/task_memory.cc',
'mach/task_memory.h', 'mach/task_memory.h',
'misc/address_sanitizer.h',
'misc/arraysize_unsafe.h', 'misc/arraysize_unsafe.h',
'misc/clock.h', 'misc/clock.h',
'misc/clock_mac.cc', 'misc/clock_mac.cc',