Skip to content

Commit d83c900

Browse files
committed
[sanitizer_common][test] Enable tests on SPARC
Unfortunately, the `sanitizer_common` tests are disabled on many targets that are supported by `sanitizer_common`, making it easy to miss issues with that support. This patch enables SPARC testing. Beside the enabling proper, the patch fixes (together with D91607 <https://reviews.llvm.org/D91607>) the failures of the `symbolize_pc.cpp`, `symbolize_pc_demangle.cpp`, and `symbolize_pc_inline.cpp` tests. They lack calls to `__builtin_extract_return_addr`. When those are added, they `PASS` when compiled with `gcc`. `clang` incorrectly doesn't implement a non-default `__builtin_extract_return_addr` on several targets, SPARC included. Because `__builtin_extract_return_addr(__builtin_return_addr(0))` is quite a mouthful and I'm uncertain if the code needs to compile with msvc which appparently has it's own `_ReturnAddress`, I've introduced `__sanitizer_return_addr` to hide the difference and complexity. Because on 32-bit SPARC `__builtin_extract_return_addr` differs when the calling function returns a struct, I've added a testcase for that. There are a couple more tests failing on SPARC that I will deal with separately. Tested on `sparcv9-sun-solaris2.11`, `amd64-pc-solaris2.11`, and `x86_64-pc-linux-gnu`. Differential Revision: https://reviews.llvm.org/D91608
1 parent d7c4072 commit d83c900

File tree

5 files changed

+42
-15
lines changed

5 files changed

+42
-15
lines changed

compiler-rt/include/sanitizer/common_interface_defs.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,15 @@ void __sanitizer_symbolize_pc(void *pc, const char *fmt, char *out_buf,
211211
// Same as __sanitizer_symbolize_pc, but for data section (i.e. globals).
212212
void __sanitizer_symbolize_global(void *data_ptr, const char *fmt,
213213
char *out_buf, size_t out_buf_size);
214+
// Determine the return address.
215+
#if !defined(_MSC_VER) || defined(__clang__)
216+
#define __sanitizer_return_address() \
217+
__builtin_extract_return_addr(__builtin_return_address(0))
218+
#else
219+
extern "C" void *_ReturnAddress(void);
220+
#pragma intrinsic(_ReturnAddress)
221+
#define __sanitizer_return_address() _ReturnAddress()
222+
#endif
214223

215224
/// Sets the callback to be called immediately before death on error.
216225
///

compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include(CompilerRTCompile)
33
clang_compiler_add_cxx_check()
44

55
# FIXME: use SANITIZER_COMMON_SUPPORTED_ARCH here
6-
filter_available_targets(SANITIZER_UNITTEST_SUPPORTED_ARCH x86_64 i386 mips64 mips64el riscv64)
6+
filter_available_targets(SANITIZER_UNITTEST_SUPPORTED_ARCH x86_64 i386 mips64 mips64el riscv64 sparcv9 sparc)
77
if(APPLE)
88
darwin_filter_host_archs(SANITIZER_UNITTEST_SUPPORTED_ARCH SANITIZER_UNITTEST_SUPPORTED_ARCH)
99
endif()

compiler-rt/test/sanitizer_common/TestCases/symbolize_pc.cpp

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,47 @@ int GLOBAL_VAR_ABC;
99

1010
void SymbolizeSmallBuffer() {
1111
char data[] = "abcdef";
12-
__sanitizer_symbolize_pc(__builtin_return_address(0), "%p %F %L", data, 0);
12+
__sanitizer_symbolize_pc(__sanitizer_return_address(), "%p %F %L", data, 0);
1313
printf("UNCHANGED '%s'\n", data);
14-
__sanitizer_symbolize_pc(__builtin_return_address(0), "%p %F %L", data, 1);
14+
__sanitizer_symbolize_pc(__sanitizer_return_address(), "%p %F %L", data, 1);
1515
printf("EMPTY '%s'\n", data);
16-
__sanitizer_symbolize_pc(__builtin_return_address(0), "%p %F %L", data,
16+
__sanitizer_symbolize_pc(__sanitizer_return_address(), "%p %F %L", data,
1717
sizeof(data));
1818
printf("PARTIAL '%s'\n", data);
1919
}
2020

2121
void SymbolizeCaller() {
2222
char data[100];
23-
__sanitizer_symbolize_pc(__builtin_return_address(0), "%p %F %L", data,
23+
__sanitizer_symbolize_pc(__sanitizer_return_address(), "%p %F %L", data,
2424
sizeof(data));
2525
printf("FIRST_FORMAT %s\n", data);
26-
__sanitizer_symbolize_pc(__builtin_return_address(0),
26+
__sanitizer_symbolize_pc(__sanitizer_return_address(),
2727
"FUNC:%f LINE:%l FILE:%s", data, sizeof(data));
2828
printf("SECOND_FORMAT %s\n", data);
29-
__sanitizer_symbolize_pc(__builtin_return_address(0),
30-
"LOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
31-
"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
32-
"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
33-
"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
34-
"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG"
35-
"FUNC:%f LINE:%l FILE:%s", data, sizeof(data));
29+
__sanitizer_symbolize_pc(__sanitizer_return_address(),
30+
"LOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
31+
"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
32+
"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
33+
"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
34+
"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG"
35+
"FUNC:%f LINE:%l FILE:%s",
36+
data, sizeof(data));
3637
printf("LONG_FORMAT %s\n", data);
3738
}
3839

40+
struct s {
41+
int i;
42+
};
43+
44+
struct s SymbolizeSRet() {
45+
char data[100];
46+
__sanitizer_symbolize_pc(__sanitizer_return_address(),
47+
"FUNC:%f LINE:%l FILE:%s", data, sizeof(data));
48+
printf("SRET: %s\n", data);
49+
struct s s = {1};
50+
return s;
51+
}
52+
3953
void SymbolizeData() {
4054
char data[100];
4155
__sanitizer_symbolize_global(&GLOBAL_VAR_ABC, "%g %s:%l", data, sizeof(data));
@@ -52,6 +66,10 @@ int main() {
5266
// CHECK: SECOND_FORMAT FUNC:main LINE:[[@LINE+1]] FILE:symbolize_pc.cpp
5367
SymbolizeCaller();
5468

69+
struct s s;
70+
// CHECK: SRET: FUNC:main LINE:[[@LINE+1]] FILE:symbolize_pc.cpp
71+
s = SymbolizeSRet();
72+
5573
// CHECK: GLOBAL: GLOBAL_VAR_ABC
5674
SymbolizeData();
5775
}

compiler-rt/test/sanitizer_common/TestCases/symbolize_pc_demangle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
char buffer[10000];
1313

1414
__attribute__((noinline)) static void Symbolize() {
15-
__sanitizer_symbolize_pc(__builtin_return_address(0), "%p %F %L", buffer,
15+
__sanitizer_symbolize_pc(__sanitizer_return_address(), "%p %F %L", buffer,
1616
sizeof(buffer));
1717
for (char *p = buffer; strlen(p); p += strlen(p) + 1)
1818
printf("%s\n", p);

compiler-rt/test/sanitizer_common/TestCases/symbolize_pc_inline.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
char buffer[10000];
1313

1414
__attribute__((noinline)) static void Symbolize() {
15-
__sanitizer_symbolize_pc(__builtin_return_address(0), "%p %F %L", buffer,
15+
__sanitizer_symbolize_pc(__sanitizer_return_address(), "%p %F %L", buffer,
1616
sizeof(buffer));
1717
for (char *p = buffer; strlen(p); p += strlen(p) + 1)
1818
printf("%s\n", p);

0 commit comments

Comments
 (0)