compat/mac/mach/mach.h - Issue 1305893010: Don’t trigger EXC_CORPSE_NOTIFY on OS X 10.11

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: compat/mac/mach/mach.h

Issue 1305893010: Don’t trigger EXC_CORPSE_NOTIFY on OS X 10.11 (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master

Patch Set: Created 5 years, 3 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

Index: compat/mac/mach/mach.h

diff --git a/compat/mac/mach/mach.h b/compat/mac/mach/mach.h

index 0cf86d05f5d8567b2b8539df1c50573c8717188c..9cfe6b62dbb4bda1f9c29d86ad4cfd6a98dcdec9 100644

--- a/compat/mac/mach/mach.h

+++ b/compat/mac/mach/mach.h

@@ -39,24 +39,33 @@

#define EXC_MASK_GUARD (1 << EXC_GUARD)

#endif

-// Don’t expose EXC_MASK_ALL or EXC_MASK_VALID at all, because their definitions

-// vary with SDK, and older kernels will reject values that they don’t

-// understand. Instead, use crashpad::ExcMaskAll(), which computes the correct

-// value of EXC_MASK_ALL for the running system.

+// 10.11 SDK

+#ifndef EXC_CORPSE_NOTIFY

+#define EXC_CORPSE_NOTIFY 13

+#endif

+#ifndef EXC_MASK_CORPSE_NOTIFY

+#define EXC_MASK_CORPSE_NOTIFY (1 << EXC_CORPSE_NOTIFY)

+#endif

+// Don’t expose EXC_MASK_ALL at all, because its definition varies with SDK, and

+// older kernels will reject values that they don’t understand. Instead, use

+// crashpad::ExcMaskAll(), which computes the correct value of EXC_MASK_ALL for

+// the running system.

#undef EXC_MASK_ALL

-#undef EXC_MASK_VALID

Mark Mentovai 2015/09/03 15:24:45 The SDK never exposed this, it was always KERNEL_P

#if defined(__i386__) || defined(__x86_64__)

// <mach/i386/exception.h>

-// 10.9 SDK

+// 10.11 SDK

-#if EXC_TYPES_COUNT > 13 // Definition varies with SDK

+#if EXC_TYPES_COUNT > 14 // Definition varies with SDK

#error Update this file for new exception types

-#elif EXC_TYPES_COUNT != 13

+#elif EXC_TYPES_COUNT != 14

#undef EXC_TYPES_COUNT

-#define EXC_TYPES_COUNT 13

+#define EXC_TYPES_COUNT 14

#endif

// <mach/i386/thread_status.h>

« no previous file with comments | « compat/mac/AvailabilityMacros.h ('k') | compat/non_mac/mach/mach.h » ('j') | util/mach/exc_server_variants.h » ('J')