Skip to content

[Darwin][Sanitizers][CrashReporter] Adopt initializer for Crash Reporter Annotations struct #123978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 23, 2025
Merged

[Darwin][Sanitizers][CrashReporter] Adopt initializer for Crash Reporter Annotations struct #123978

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7af796
[Darwin][Sanitizers][CrashReporter] Adopt initializer for Crash Repor…
thetruestblue Jan 22, 2025
576a920
Update compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp
thetruestblue Jan 23, 2025
2154683
Merge branch 'main' into main
thetruestblue Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ extern char **environ;
# define SANITIZER_OS_TRACE 0
# endif

// import new crash reporting api
// Integrate with CrashReporter library if available
# if defined(__has_include) && __has_include(<CrashReporterClient.h>)
# define HAVE_CRASHREPORTERCLIENT_H 1
# include <CrashReporterClient.h>
Expand Down Expand Up @@ -796,8 +796,13 @@ static char crashreporter_info_buff[__sanitizer::kErrorMessageBufferSize] = {};
static Mutex crashreporter_info_mutex;

extern "C" {
// Integrate with crash reporter libraries.

#if HAVE_CRASHREPORTERCLIENT_H
// Available in CRASHREPORTER_ANNOTATIONS_VERSION 5+
# ifdef CRASHREPORTER_ANNOTATIONS_INITIALIZER
CRASHREPORTER_ANNOTATIONS_INITIALIZER()
# else
// Support for older CrashRerporter annotiations
CRASH_REPORTER_CLIENT_HIDDEN
struct crashreporter_annotations_t gCRAnnotations
__attribute__((section("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION))) = {
Expand All @@ -808,17 +813,17 @@ struct crashreporter_annotations_t gCRAnnotations
0,
0,
0,
#if CRASHREPORTER_ANNOTATIONS_VERSION > 4
# if CRASHREPORTER_ANNOTATIONS_VERSION > 4
0,
#endif
# endif
};

#else
// fall back to old crashreporter api
# endif
# else
// Revert to previous crash reporter API if client header is not available
static const char *__crashreporter_info__ __attribute__((__used__)) =
&crashreporter_info_buff[0];
asm(".desc ___crashreporter_info__, 0x10");
#endif
#endif // HAVE_CRASHREPORTERCLIENT_H

} // extern "C"

Expand Down
Loading