Skip to content

Commit 230b502

Browse files
authored
Merge pull request #6940 from hughbe/crash-client-hidden
Remove CRASH_REPORTER_CLIENT_HIDDEN in favour of equivilent LLVM macro
2 parents 28a87e6 + 4e55214 commit 230b502

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

include/swift/Runtime/Debug.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
#ifdef SWIFT_HAVE_CRASHREPORTERCLIENT
2727

28-
#define CRASH_REPORTER_CLIENT_HIDDEN __attribute__((visibility("hidden")))
2928
#define CRASHREPORTER_ANNOTATIONS_VERSION 5
3029
#define CRASHREPORTER_ANNOTATIONS_SECTION "__crash_info"
3130

@@ -41,7 +40,7 @@ struct crashreporter_annotations_t {
4140
};
4241

4342
extern "C" {
44-
CRASH_REPORTER_CLIENT_HIDDEN
43+
LLVM_LIBRARY_VISIBILITY
4544
extern struct crashreporter_annotations_t gCRAnnotations;
4645
}
4746

stdlib/public/runtime/Errors.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ static void dumpStackTraceEntry(unsigned index, void *framePC) {
152152
// The layout of this struct is CrashReporter ABI, so there are no ABI concerns
153153
// here.
154154
extern "C" {
155-
CRASH_REPORTER_CLIENT_HIDDEN
155+
LLVM_LIBRARY_VISIBILITY
156156
struct crashreporter_annotations_t gCRAnnotations
157157
__attribute__((__section__("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION))) = {
158158
CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0, 0, 0, 0};

0 commit comments

Comments
 (0)