Commit 69100695 authored by Lucian Grijincu's avatar Lucian Grijincu Committed by Facebook GitHub Bot

folly: symbolizer: tests: switch from qsort to lfind -- ASAN in LLVM12 adds an...

folly: symbolizer: tests: switch from qsort to lfind -- ASAN in LLVM12 adds an __interceptor_qsort.part.0 which makes stacks differ between ASAN and non-ASAN

Summary:
LLVM 12's ASAN intercepts qsort and adds a new stack frame for the intercetor `__interceptor_qsort.part.0`.

That can be solved by switching offsets between mode/dev & mode/opt, but it only makes tests harder to read.

So switch to `lfind` which also lives in a separate `.so` (feature used in tests), but is simple enough that ASAN doesn't need to intercept it.

Differential Revision: D30665575

fbshipit-source-id: ba540aede33c37bea8e1f4777bd7325699f9a8d2
parent 490b287c
......@@ -32,7 +32,7 @@ using namespace folly::symbolizer::test;
FOLLY_NOINLINE void lexicalBlockBar() try {
size_t unused = 0;
unused++;
inlineB_inlineA_qsort();
inlineB_inlineA_lfind();
} catch (...) {
folly::assume_unreachable();
}
......@@ -45,7 +45,7 @@ void run(LocationInfoMode mode, size_t n) {
gComparatorGetStackTrace = (bool (*)(void*))getStackTrace<100>;
lexicalBlockBar();
symbolizer.symbolize(frames);
// The address of the line where lexicalBlockBar calls inlineB_inlineA_qsort.
// The address of the line where lexicalBlockBar calls inlineB_inlineA_lfind.
uintptr_t address = frames.frames[7].addr;
ElfFile elf("/proc/self/exe");
......
......@@ -22,11 +22,13 @@
extern "C" {
// Fwd declare instead of #include <stdlib.h> to minimize generated DWARF.
void qsort(
void* base,
unsigned long nmemb,
void* lfind(
const void* key,
const void* base,
unsigned long* nmemb,
unsigned long size,
int (*compar)(const void*, const void*));
} // "C"
namespace folly {
......@@ -38,28 +40,30 @@ namespace test {
* cases that define and declare inline functions in different files.
*/
__attribute__((__always_inline__)) inline void inlineA_qsort() {
__attribute__((__always_inline__)) inline void inlineA_lfind() {
int a[2] = {1, 2};
// Use qsort, which is in a different library
kLineno_qsort = __LINE__ + 1;
qsort(a, 2, sizeof(int), testComparator);
// Use lfind, which is in a different library
int key = 1;
unsigned long nmemb = 2;
kLineno_lfind = __LINE__ + 1;
lfind(&key, a, &nmemb, sizeof(int), testComparator);
}
__attribute__((__always_inline__)) inline void inlineB_inlineA_qsort() {
kLineno_inlineA_qsort = __LINE__ + 1;
inlineA_qsort();
__attribute__((__always_inline__)) inline void inlineB_inlineA_lfind() {
kLineno_inlineA_lfind = __LINE__ + 1;
inlineA_lfind();
}
__attribute__((__always_inline__)) inline void
ClassDifferentFile::memberInline_inlineA_qsort() const {
kLineno_inlineA_qsort = __LINE__ + 1;
inlineA_qsort();
ClassDifferentFile::memberInline_inlineA_lfind() const {
kLineno_inlineA_lfind = __LINE__ + 1;
inlineA_lfind();
}
/* static */ __attribute__((__always_inline__)) inline void
ClassDifferentFile::staticMemberInline_inlineA_qsort() {
kLineno_inlineA_qsort = __LINE__ + 1;
inlineA_qsort();
ClassDifferentFile::staticMemberInline_inlineA_lfind() {
kLineno_inlineA_lfind = __LINE__ + 1;
inlineA_lfind();
}
} // namespace test
......
......@@ -27,80 +27,83 @@ void* gComparatorGetStackTraceArg = nullptr;
int testComparator(const void* ap, const void* bp) {
// This comparator is called for the side effect of capturing the stack trace.
// The function that calls it: qsort usually lives in a separate library -
// The function that calls it: lfind usually lives in a separate library -
// which exercises cross-ELF file support.
(*gComparatorGetStackTrace)(gComparatorGetStackTraceArg);
int a = *static_cast<const int*>(ap);
int b = *static_cast<const int*>(bp);
return a < b ? -1 : a > b ? 1 : 0;
// which returns zero if the key object matches the array member, and nonzero
// otherwise.
return (a == b) ? 0 : 1;
// return a < b ? -1 : a > b ? 1 : 0;
}
int kLineno_qsort = 0;
int kLineno_inlineA_qsort = 0;
int kLineno_inlineB_inlineA_qsort = 0;
int kLineno_lfind = 0;
int kLineno_inlineA_lfind = 0;
int kLineno_inlineB_inlineA_lfind = 0;
// NOTE: inlineLTO_inlineA_qsort is only inlined with LTO/ThinLTO.
void inlineLTO_inlineA_qsort() {
kLineno_inlineA_qsort = __LINE__ + 1;
inlineA_qsort();
// NOTE: inlineLTO_inlineA_lfind is only inlined with LTO/ThinLTO.
void inlineLTO_inlineA_lfind() {
kLineno_inlineA_lfind = __LINE__ + 1;
inlineA_lfind();
}
void call_inlineA_qsort() {
inlineA_qsort();
void call_inlineA_lfind() {
inlineA_lfind();
}
void call_inlineB_inlineA_qsort() {
inlineB_inlineA_qsort();
void call_inlineB_inlineA_lfind() {
inlineB_inlineA_lfind();
}
void call_inlineLTO_inlineA_qsort() {
inlineLTO_inlineA_qsort();
void call_inlineLTO_inlineA_lfind() {
inlineLTO_inlineA_lfind();
}
class ClassSameFile {
public:
__attribute__((__always_inline__)) void memberInline_inlineA_qsort() const {
kLineno_inlineA_qsort = __LINE__ + 1;
inlineA_qsort();
__attribute__((__always_inline__)) void memberInline_inlineA_lfind() const {
kLineno_inlineA_lfind = __LINE__ + 1;
inlineA_lfind();
}
__attribute__((__always_inline__)) static void
staticMemberInline_inlineA_qsort() {
kLineno_inlineA_qsort = __LINE__ + 1;
inlineA_qsort();
staticMemberInline_inlineA_lfind() {
kLineno_inlineA_lfind = __LINE__ + 1;
inlineA_lfind();
}
int dummy() const { return dummy_; }
int dummy_ = 0;
};
void call_same_file_memberInline_inlineA_qsort() {
void call_same_file_memberInline_inlineA_lfind() {
ClassSameFile obj;
obj.memberInline_inlineA_qsort();
obj.memberInline_inlineA_lfind();
}
void call_same_file_staticMemberInline_inlineA_qsort() {
ClassSameFile::staticMemberInline_inlineA_qsort();
void call_same_file_staticMemberInline_inlineA_lfind() {
ClassSameFile::staticMemberInline_inlineA_lfind();
}
void call_different_file_memberInline_inlineA_qsort() {
void call_different_file_memberInline_inlineA_lfind() {
ClassDifferentFile obj;
obj.memberInline_inlineA_qsort();
obj.memberInline_inlineA_lfind();
}
void call_different_file_staticMemberInline_inlineA_qsort() {
ClassDifferentFile::staticMemberInline_inlineA_qsort();
void call_different_file_staticMemberInline_inlineA_lfind() {
ClassDifferentFile::staticMemberInline_inlineA_lfind();
}
void lexicalBlock_inlineB_inlineA_qsort() try {
kLineno_inlineB_inlineA_qsort = __LINE__ + 1;
inlineB_inlineA_qsort();
void lexicalBlock_inlineB_inlineA_lfind() try {
kLineno_inlineB_inlineA_lfind = __LINE__ + 1;
inlineB_inlineA_lfind();
} catch (...) {
}
void call_lexicalBlock_inlineB_inlineA_qsort() {
lexicalBlock_inlineB_inlineA_qsort();
void call_lexicalBlock_inlineB_inlineA_lfind() {
lexicalBlock_inlineB_inlineA_lfind();
}
} // namespace test
......
......@@ -29,34 +29,34 @@ extern void* gComparatorGetStackTraceArg;
int testComparator(const void* ap, const void* bp);
// Set to the line number in the caller function when calling
// qsort/inlineA_qsort/inlineB_inlineA_qsort.
extern int kLineno_qsort;
extern int kLineno_inlineA_qsort;
extern int kLineno_inlineB_inlineA_qsort;
// lfind/inlineA_lfind/inlineB_inlineA_lfind.
extern int kLineno_lfind;
extern int kLineno_inlineA_lfind;
extern int kLineno_inlineB_inlineA_lfind;
// Debug Info for inlined functions is emitted in the functions where they're
// inlined in. The SymbolizeTest.o object file has many dependencies and will
// have a huge amount of debug info. To simplify debugging call inlined
// functions through these trampolines so that all debug info worth inspecting
// is emitted in the tiny SymbolizerTestUtils.o
void call_inlineA_qsort();
void call_inlineB_inlineA_qsort();
void call_inlineLTO_inlineA_qsort();
void call_same_file_memberInline_inlineA_qsort();
void call_same_file_staticMemberInline_inlineA_qsort();
void call_different_file_memberInline_inlineA_qsort();
void call_different_file_staticMemberInline_inlineA_qsort();
void call_lexicalBlock_inlineB_inlineA_qsort();
void call_inlineA_lfind();
void call_inlineB_inlineA_lfind();
void call_inlineLTO_inlineA_lfind();
void call_same_file_memberInline_inlineA_lfind();
void call_same_file_staticMemberInline_inlineA_lfind();
void call_different_file_memberInline_inlineA_lfind();
void call_different_file_staticMemberInline_inlineA_lfind();
void call_lexicalBlock_inlineB_inlineA_lfind();
// NOTE: inlineLTO_inlineA_qsort is only inlined with LTO/ThinLTO.
void inlineLTO_inlineA_qsort();
// NOTE: inlineLTO_inlineA_lfind is only inlined with LTO/ThinLTO.
void inlineLTO_inlineA_lfind();
class ClassDifferentFile {
public:
__attribute__((__always_inline__)) inline void memberInline_inlineA_qsort()
__attribute__((__always_inline__)) inline void memberInline_inlineA_lfind()
const;
__attribute__((__always_inline__)) inline static void
staticMemberInline_inlineA_qsort();
staticMemberInline_inlineA_lfind();
int dummy() const { return dummy_; }
int dummy_ = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment