Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Unified Diff: third_party/crashpad/crashpad/client/crashpad_info.cc

Issue 2555353002: Update Crashpad to 32981a3ee9d7c2769fb27afa038fe2e194cfa329 (Closed)
Patch Set: fix readme Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/crashpad/crashpad/client/crashpad_info.cc
diff --git a/third_party/crashpad/crashpad/client/crashpad_info.cc b/third_party/crashpad/crashpad/client/crashpad_info.cc
index e8a6a9eee55fbff538f503a82bc9f14d91c20236..e517f7b1dc04cd6635a289883eec90b743db2fff 100644
--- a/third_party/crashpad/crashpad/client/crashpad_info.cc
+++ b/third_party/crashpad/crashpad/client/crashpad_info.cc
@@ -14,6 +14,7 @@
#include "client/crashpad_info.h"
+#include "util/misc/address_sanitizer.h"
#include "util/stdlib/cxx.h"
#if defined(OS_MACOSX)
@@ -72,14 +73,14 @@ __attribute__((
#error Port
#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,
// which would be reflected in the size of the custom section. This confuses
// MachOImageReader::GetCrashpadInfo(), which finds that the section’s size
// disagrees with the structure’s size_ field. By specifying an alignment
// greater than the red zone size, the red zone will be suppressed.
aligned(64),
-#endif // __has_feature(address_sanitizer)
+#endif // defined(ADDRESS_SANITIZER)
// The “used” attribute prevents the structure from being dead-stripped.
used,
« no previous file with comments | « third_party/crashpad/crashpad/client/crashpad_info.h ('k') | third_party/crashpad/crashpad/client/prune_crash_reports.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698