Update Crashpad to b47bf6c250c6b825dee1c5fbad9152c2c962e828

third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test.cc

 // Copyright 2014 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,
@@ skipping 99 matching lines @@
                                    mach_msg_type_number_t code_count,
                                    thread_state_flavor_t* flavor,
                                    ConstThreadState old_state,
                                    mach_msg_type_number_t old_state_count,
                                    thread_state_t new_state,
                                    mach_msg_type_number_t* new_state_count,
                                    const mach_msg_trailer_t* trailer,
                                    bool* destroy_complex_request) override {
     *destroy_complex_request = true;
 
-    EXPECT_EQ(ChildTask(), task);
+    // In 10.12, dyld fatal errors as tested by test_type_ = kCrashDyld are via
+    // abort_with_payload(). In 10.12.1, the task port delivered in an exception
+    // message for this termination type is a corpse, even when the exception is
+    // EXC_CRASH and not EXC_CORPSE_NOTIFY. The corpse task port (here, |task|)
+    // is distinct from the process’ original task port (ChildTask()). This is
+    // filed as https://openradar.appspot.com/29079442.
+    //
+    // Instead of comparing task ports, compare PIDs.
+    pid_t task_pid;
+    kern_return_t kr = pid_for_task(task, &task_pid);
+    EXPECT_EQ(KERN_SUCCESS, kr) << MachErrorMessage(kr, "pid_for_task");
+    EXPECT_EQ(ChildPID(), task_pid);
 
     ProcessReader process_reader;
     bool rv = process_reader.Initialize(task);
     if (!rv) {
       ADD_FAILURE();
     } else {
       const std::vector<ProcessReader::Module>& modules =
           process_reader.Modules();
       std::vector<std::string> all_annotations_vector;
       for (const ProcessReader::Module& module : modules) {
@@ skipping 276 matching lines @@
 
 TEST(MachOImageAnnotationsReader, CrashDyld) {
   TestMachOImageAnnotationsReader test_mach_o_image_annotations_reader(
       TestMachOImageAnnotationsReader::kCrashDyld);
   test_mach_o_image_annotations_reader.Run();
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad