This is an archive of the discontinued LLVM Phabricator instance.

Differential D148351

[libunwind] Sync Unwind_AppleExtras.cpp with downstream version
ClosedPublic

Authored by ldionne on Apr 14 2023, 9:51 AM.

Details

Reviewers
compnerd
mstorsjo
Group Reviewers
Restricted Project
Commits
rGca4fb463187c: [libunwind] Sync Unwind_AppleExtras.cpp with downstream version
Summary

Both had diverged in a few ways, so this brings them both back in sync.

Diff Detail

Event Timeline

ldionne created this revision.Apr 14 2023, 9:51 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptApr 14 2023, 9:51 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
ldionne requested review of this revision.Apr 14 2023, 9:51 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 14 2023, 9:51 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
mstorsjo accepted this revision.Apr 14 2023, 10:21 AM
mstorsjo added a subscriber: mstorsjo.

LGTM

This revision is now accepted and ready to land.Apr 14 2023, 10:21 AM
Harbormaster completed remote builds in B225655: Diff 513643.Apr 14 2023, 10:41 AM
ldionne updated this revision to Diff 513744.Apr 14 2023, 2:18 PM

Rebase onto main

ldionne added a comment.Apr 15 2023, 2:37 AM

CI failures are flakes, shipping.

This revision was landed with ongoing or failed builds.Apr 15 2023, 2:38 AM
Closed by commit rGca4fb463187c: [libunwind] Sync Unwind_AppleExtras.cpp with downstream version (authored by ldionne). · Explain Why
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rGca4fb463187c: [libunwind] Sync Unwind_AppleExtras.cpp with downstream version.
Harbormaster completed remote builds in B225726: Diff 513744.Apr 17 2023, 8:52 AM

Revision Contents

PathSize
libunwind/
src/
22 lines

Diff 513872

libunwind/src/Unwind_AppleExtras.cpp

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "config.h" #include "config.h"
#include <TargetConditionals.h>
// static linker symbols to prevent wrong two level namespace for _Unwind symbols // static linker symbols to prevent wrong two level namespace for _Unwind symbols
#if defined(__arm__) #if defined(__arm__)
# if defined(__USING_SJLJ_EXCEPTIONS__) && TARGET_OS_IOS
#define NOT_HERE_BEFORE_5_0(sym) \ # define NOT_HERE_BEFORE_5_0(sym) \
extern const char sym##_tmp30 __asm("$ld$hide$os3.0$_" #sym ); \ extern const char sym##_tmp30 __asm("$ld$hide$os3.0$_" #sym ); \
__attribute__((visibility("default"))) const char sym##_tmp30 = 0; \ __attribute__((visibility("default"))) const char sym##_tmp30 = 0; \
extern const char sym##_tmp31 __asm("$ld$hide$os3.1$_" #sym ); \ extern const char sym##_tmp31 __asm("$ld$hide$os3.1$_" #sym ); \
__attribute__((visibility("default"))) const char sym##_tmp31 = 0; \ __attribute__((visibility("default"))) const char sym##_tmp31 = 0; \
extern const char sym##_tmp32 __asm("$ld$hide$os3.2$_" #sym );\ extern const char sym##_tmp32 __asm("$ld$hide$os3.2$_" #sym );\
__attribute__((visibility("default"))) const char sym##_tmp32 = 0; \ __attribute__((visibility("default"))) const char sym##_tmp32 = 0; \
extern const char sym##_tmp40 __asm("$ld$hide$os4.0$_" #sym ); \ extern const char sym##_tmp40 __asm("$ld$hide$os4.0$_" #sym ); \
__attribute__((visibility("default"))) const char sym##_tmp40 = 0; \ __attribute__((visibility("default"))) const char sym##_tmp40 = 0; \
extern const char sym##_tmp41 __asm("$ld$hide$os4.1$_" #sym ); \ extern const char sym##_tmp41 __asm("$ld$hide$os4.1$_" #sym ); \
__attribute__((visibility("default"))) const char sym##_tmp41 = 0; \ __attribute__((visibility("default"))) const char sym##_tmp41 = 0; \
extern const char sym##_tmp42 __asm("$ld$hide$os4.2$_" #sym ); \ extern const char sym##_tmp42 __asm("$ld$hide$os4.2$_" #sym ); \
__attribute__((visibility("default"))) const char sym##_tmp42 = 0; \ __attribute__((visibility("default"))) const char sym##_tmp42 = 0; \
extern const char sym##_tmp43 __asm("$ld$hide$os4.3$_" #sym ); \ extern const char sym##_tmp43 __asm("$ld$hide$os4.3$_" #sym ); \
__attribute__((visibility("default"))) const char sym##_tmp43 = 0; __attribute__((visibility("default"))) const char sym##_tmp43 = 0;
#elif defined(__aarch64__) # else // defined(__USING_SJLJ_EXCEPTIONS__) && TARGET_OS_IOS
# define NOT_HERE_BEFORE_5_0(sym)
#define NOT_HERE_BEFORE_10_6(sym) # define NOT_HERE_BEFORE_10_6(sym)
#define NEVER_HERE(sym) # define NEVER_HERE(sym)
#else # endif // defined(__USING_SJLJ_EXCEPTIONS__) && TARGET_OS_IOS
#elif TARGET_OS_OSX && !defined(__aarch64__)
#define NOT_HERE_BEFORE_10_6(sym) \ # define NOT_HERE_BEFORE_10_6(sym) \
extern const char sym##_tmp4 __asm("$ld$hide$os10.4$_" #sym ); \ extern const char sym##_tmp4 __asm("$ld$hide$os10.4$_" #sym ); \
__attribute__((visibility("default"))) const char sym##_tmp4 = 0; \ __attribute__((visibility("default"))) const char sym##_tmp4 = 0; \
extern const char sym##_tmp5 __asm("$ld$hide$os10.5$_" #sym ); \ extern const char sym##_tmp5 __asm("$ld$hide$os10.5$_" #sym ); \
__attribute__((visibility("default"))) const char sym##_tmp5 = 0; __attribute__((visibility("default"))) const char sym##_tmp5 = 0;
#define NEVER_HERE(sym) \ # define NEVER_HERE(sym) \
extern const char sym##_tmp4 __asm("$ld$hide$os10.4$_" #sym ); \ extern const char sym##_tmp4 __asm("$ld$hide$os10.4$_" #sym ); \
__attribute__((visibility("default"))) const char sym##_tmp4 = 0; \ __attribute__((visibility("default"))) const char sym##_tmp4 = 0; \
extern const char sym##_tmp5 __asm("$ld$hide$os10.5$_" #sym ); \ extern const char sym##_tmp5 __asm("$ld$hide$os10.5$_" #sym ); \
__attribute__((visibility("default"))) const char sym##_tmp5 = 0; \ __attribute__((visibility("default"))) const char sym##_tmp5 = 0; \
extern const char sym##_tmp6 __asm("$ld$hide$os10.6$_" #sym ); \ extern const char sym##_tmp6 __asm("$ld$hide$os10.6$_" #sym ); \
__attribute__((visibility("default"))) const char sym##_tmp6 = 0; __attribute__((visibility("default"))) const char sym##_tmp6 = 0;
#else
# define NOT_HERE_BEFORE_10_6(sym)
# define NEVER_HERE(sym)
#endif #endif
#if defined(_LIBUNWIND_BUILD_ZERO_COST_APIS) #if defined(_LIBUNWIND_BUILD_ZERO_COST_APIS)
// //
// symbols in libSystem.dylib in 10.6 and later, but are in libgcc_s.dylib in // symbols in libSystem.dylib in 10.6 and later, but are in libgcc_s.dylib in
// earlier versions // earlier versions
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines