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

Unified Diff: third_party/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.cc

Issue 2072393002: Update Crashpad to improve macOS 10.12 support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months 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
« no previous file with comments | « third_party/crashpad/README.chromium ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.cc
diff --git a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.cc b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.cc
index 9b07e904ea87c6cd47c44bba36d657ae9ae22e6c..9837a9c53e549d956a678ccb7576f5705119f9b6 100644
--- a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.cc
+++ b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.cc
@@ -122,7 +122,7 @@ bool MachOImageSegmentReader::Initialize(ProcessReader* process_reader,
if (section_segment_name != segment_name) {
// cl_kernels modules (for OpenCL) aren’t ld output, and they’re formatted
- // incorrectly on OS X 10.10 and 10.11. They have a single __TEXT segment,
+ // incorrectly on OS X 10.10 and later. They have a single __TEXT segment,
// but one of the sections within it claims to belong to the __LD segment.
// This mismatch shouldn’t happen. This errant section also has the
// S_ATTR_DEBUG flag set, which shouldn’t happen unless all of the other
@@ -136,7 +136,7 @@ bool MachOImageSegmentReader::Initialize(ProcessReader* process_reader,
bool ok = false;
if (file_type == MH_BUNDLE && module_name == "cl_kernels") {
int mac_os_x_minor_version = MacOSXMinorVersion();
- if ((mac_os_x_minor_version == 10 || mac_os_x_minor_version == 11) &&
+ if ((mac_os_x_minor_version >= 10 && mac_os_x_minor_version <= 12) &&
segment_name == SEG_TEXT &&
section_segment_name == "__LD" &&
section_name == "__compact_unwind" &&
@@ -173,27 +173,6 @@ bool MachOImageSegmentReader::Initialize(ProcessReader* process_reader,
return false;
}
- uint32_t section_type = (section.flags & SECTION_TYPE);
- bool zero_fill = section_type == S_ZEROFILL ||
- section_type == S_GB_ZEROFILL ||
- section_type == S_THREAD_LOCAL_ZEROFILL;
-
- // Zero-fill section types aren’t mapped from the file, so their |offset|
- // fields are irrelevant and are typically 0.
- if (!zero_fill &&
- section.offset - segment_command_.fileoff !=
- section.addr - segment_command_.vmaddr) {
- LOG(WARNING) << base::StringPrintf(
- "section type 0x%x at 0x%llx has unexpected offset "
- "0x%x in segment at 0x%llx with offset 0x%llx",
- section_type,
- section.addr,
- section.offset,
- segment_command_.vmaddr,
- segment_command_.fileoff) << section_info;
- return false;
- }
-
const auto insert_result =
section_map_.insert(std::make_pair(section_name, section_index));
if (!insert_result.second) {
« no previous file with comments | « third_party/crashpad/README.chromium ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698