0

Update Crashpad to 9f896f2581c076ec028935b8d9703551eb73a796

337b4f797187 [mac] mach_absolute_time() ->
             clock_gettime_nsec_np(CLOCK_UPTIME_RAW)
9f896f2581c0 Qualify bit_cast with base::

Bug: 1506769
Change-Id: I5e7d5e69b4e6bc4b7150ad9aec415a8b7805aef6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5117342
Auto-Submit: Avi Drissman <avi@chromium.org>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Commit-Queue: Avi Drissman <avi@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Mark Mentovai <mark@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1236680}
This commit is contained in:
Avi Drissman
2023-12-13 00:28:46 +00:00
committed by Chromium LUCI CQ
parent 425f5ab950
commit d74b3a1b7f
5 changed files with 4 additions and 28 deletions
third_party/crashpad

@ -2,7 +2,7 @@ Name: Crashpad
Short Name: crashpad
URL: https://crashpad.chromium.org/
Version: N/A
Revision: 7049d966b5b24bcd4ce0a27312a366592019f1e8
Revision: 9f896f2581c076ec028935b8d9703551eb73a796
License: Apache 2.0
License File: crashpad/LICENSE
Security Critical: yes
@ -46,8 +46,6 @@ Local Modifications:
(crashpad/util/BUILD.gn, crashpad/util/linux/memory_map_test.cc)
- CloseMultipleNowOrOnExec has been updated to invoke the new
base::subtle::ResetFDOwnership() API
- FALLTHROUGH macro has been replaced with C++17 attribute [[fallthrough]]
- Qualified calls to bit_cast<>() with base::.
- MultiprocessExec.MultiprocessExec is disabled entirely on the Mac.
https://crbug.com/1341377
- SystemSnapshotLinux.Basic is disabled on Android: https://crbug.com/1362091

@ -47,7 +47,7 @@ deps = {
'9719c1e1e676814c456b55f5f070eabad6709d31',
'crashpad/third_party/mini_chromium/mini_chromium':
Var('chromium_git') + '/chromium/mini_chromium@' +
'9e21183c1ea369398d6f6ddd302c8db580bd19c4',
'ac3e7323953425b2b48af2536f5a6f778dcd0f4c',
'crashpad/third_party/libfuzzer/src':
Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' +
'fda403cf93ecb8792cb1d061564d89a6553ca020',

@ -43,7 +43,6 @@
#include <type_traits>
#include <typeinfo>
#include "base/bit_cast.h"
#include "base/format_macros.h"
#include "base/logging.h"
#include "base/memory/free_deleter.h"

@ -18,7 +18,6 @@
#include <string.h>
#include <sys/sysmacros.h>
#include "base/bit_cast.h"
#include "base/check_op.h"
#include "base/files/file_path.h"
#include "base/logging.h"

@ -14,32 +14,12 @@
#include "util/misc/clock.h"
#include <mach/mach_time.h>
#include "base/apple/mach_logging.h"
namespace {
mach_timebase_info_data_t* TimebaseInternal() {
mach_timebase_info_data_t* timebase_info = new mach_timebase_info_data_t;
kern_return_t kr = mach_timebase_info(timebase_info);
MACH_CHECK(kr == KERN_SUCCESS, kr) << "mach_timebase_info";
return timebase_info;
}
mach_timebase_info_data_t* Timebase() {
static mach_timebase_info_data_t* timebase_info = TimebaseInternal();
return timebase_info;
}
} // namespace
#include <time.h>
namespace crashpad {
uint64_t ClockMonotonicNanoseconds() {
uint64_t absolute_time = mach_absolute_time();
mach_timebase_info_data_t* timebase_info = Timebase();
return absolute_time * timebase_info->numer / timebase_info->denom;
return clock_gettime_nsec_np(CLOCK_UPTIME_RAW);
}
} // namespace crashpad