luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

symbolize_unittest: make it a bit more portable (#985)

Browse Source
This commit is contained in:
Mike Frysinger 2023-12-20 15:10:26 -05:00 committed by GitHub
parent 3fcf77a691
commit 6607b369d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/symbolize_unittest.cc
View File

@ -86,9 +86,7 @@ static const char *TrySymbolize(void *pc) {
# endif // __i386__ # endif // __i386__
# else # else
# endif // __GNUC__ >= 4 # endif // __GNUC__ >= 4
# if defined(__i386__) || defined(__x86_64__) # define TEST_WITH_LABEL_ADDRESSES
# define TEST_X86_32_AND_64 1
# endif // defined(__i386__) || defined(__x86_64__)
#endif #endif
// Make them C linkage to avoid mangled names. // Make them C linkage to avoid mangled names.
@ -334,8 +332,9 @@ TEST(Symbolize, SymbolizeWithDemanglingStackConsumption) {
extern "C" { extern "C" {
inline void* always_inline inline_func() { inline void* always_inline inline_func() {
void *pc = nullptr; void *pc = nullptr;
#ifdef TEST_X86_32_AND_64 #ifdef TEST_WITH_LABEL_ADDRESSES
__asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc)); pc = &&curr_pc;
curr_pc:
#endif #endif
return pc; return pc;
} }
@ -343,14 +342,15 @@ inline void* always_inline inline_func() {
void* ATTRIBUTE_NOINLINE non_inline_func(); void* ATTRIBUTE_NOINLINE non_inline_func();
void* ATTRIBUTE_NOINLINE non_inline_func() { void* ATTRIBUTE_NOINLINE non_inline_func() {
void *pc = nullptr; void *pc = nullptr;
#ifdef TEST_X86_32_AND_64 #ifdef TEST_WITH_LABEL_ADDRESSES
__asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc)); pc = &&curr_pc;
curr_pc:
#endif #endif
return pc; return pc;
} }
static void ATTRIBUTE_NOINLINE TestWithPCInsideNonInlineFunction() { static void ATTRIBUTE_NOINLINE TestWithPCInsideNonInlineFunction() {
#if defined(TEST_X86_32_AND_64) && defined(HAVE_ATTRIBUTE_NOINLINE) #if defined(TEST_WITH_LABEL_ADDRESSES) && defined(HAVE_ATTRIBUTE_NOINLINE)
void *pc = non_inline_func(); void *pc = non_inline_func();
const char *symbol = TrySymbolize(pc); const char *symbol = TrySymbolize(pc);
@ -363,7 +363,7 @@ static void ATTRIBUTE_NOINLINE TestWithPCInsideNonInlineFunction() {
} }
static void ATTRIBUTE_NOINLINE TestWithPCInsideInlineFunction() { static void ATTRIBUTE_NOINLINE TestWithPCInsideInlineFunction() {
#if defined(TEST_X86_32_AND_64) && defined(HAVE_ALWAYS_INLINE) #if defined(TEST_WITH_LABEL_ADDRESSES) && defined(HAVE_ALWAYS_INLINE)
void *pc = inline_func(); // Must be inlined. void *pc = inline_func(); // Must be inlined.
const char *symbol = TrySymbolize(pc); const char *symbol = TrySymbolize(pc);