Skip to content

[symbolizer] Don't treat symbolizer API as optional #76103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 20, 2023
Merged

[symbolizer] Don't treat symbolizer API as optional #76103

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85edda9
[𝘀𝗽𝗿] initial version
vitalybuka Dec 20, 2023
489d3dd
typo
vitalybuka Dec 20, 2023
b3f88bd
format
vitalybuka Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 10 additions & 17 deletions compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,15 +341,14 @@ __sanitizer_symbolize_set_inline_frames(bool InlineFrames);
class InternalSymbolizer final : public SymbolizerTool {
public:
static InternalSymbolizer *get(LowLevelAllocator *alloc) {
if (&__sanitizer_symbolize_set_demangle)
CHECK(__sanitizer_symbolize_set_demangle(common_flags()->demangle));
if (&__sanitizer_symbolize_set_inline_frames)
CHECK(__sanitizer_symbolize_set_inline_frames(
common_flags()->symbolize_inline_frames));
// These are essential, we don't have InternalSymbolizer without them.
if (&__sanitizer_symbolize_code && &__sanitizer_symbolize_data)
return new (*alloc) InternalSymbolizer();
return 0;
// These one is the most used one, so we will use it to detect a presence of
// internal symbolizer.
if (&__sanitizer_symbolize_code == nullptr)
return nullptr;
CHECK(__sanitizer_symbolize_set_demangle(common_flags()->demangle));
CHECK(__sanitizer_symbolize_set_inline_frames(
common_flags()->symbolize_inline_frames));
return new (*alloc) InternalSymbolizer();
}

bool SymbolizePC(uptr addr, SymbolizedStack *stack) override {
Expand All @@ -371,23 +370,17 @@ class InternalSymbolizer final : public SymbolizerTool {
}

bool SymbolizeFrame(uptr addr, FrameInfo *info) override {
if (&__sanitizer_symbolize_frame == nullptr)
return false;
bool result = __sanitizer_symbolize_frame(info->module, info->module_offset,
buffer_, sizeof(buffer_));
if (result)
ParseSymbolizeFrameOutput(buffer_, &info->locals);
return result;
}

void Flush() override {
if (&__sanitizer_symbolize_flush)
__sanitizer_symbolize_flush();
}
void Flush() override { __sanitizer_symbolize_flush(); }

const char *Demangle(const char *name) override {
if (&__sanitizer_symbolize_demangle &&
__sanitizer_symbolize_demangle(name, buffer_, sizeof(buffer_))) {
if (__sanitizer_symbolize_demangle(name, buffer_, sizeof(buffer_))) {
char *res_buff = nullptr;
ExtractToken(buffer_, "", &res_buff);
return res_buff;
Expand Down