diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.cpp index 8db321051e1a0..69047c2e31eca 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.cpp +++ b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.cpp @@ -32,8 +32,7 @@ StackTracePrinter *StackTracePrinter::GetOrInit() { return stacktrace_printer; } -const char *FormattedStackTracePrinter::StripFunctionName( - const char *function) { +const char *StackTracePrinter::StripFunctionName(const char *function) { if (!common_flags()->demangle) return function; if (!function) @@ -324,9 +323,10 @@ void FormattedStackTracePrinter::RenderData(InternalScopedString *buffer, #endif // !SANITIZER_SYMBOLIZER_MARKUP -void FormattedStackTracePrinter::RenderSourceLocation( - InternalScopedString *buffer, const char *file, int line, int column, - bool vs_style, const char *strip_path_prefix) { +void StackTracePrinter::RenderSourceLocation(InternalScopedString *buffer, + const char *file, int line, + int column, bool vs_style, + const char *strip_path_prefix) { if (vs_style && line > 0) { buffer->AppendF("%s(%d", StripPathPrefix(file, strip_path_prefix), line); if (column > 0) @@ -343,9 +343,10 @@ void FormattedStackTracePrinter::RenderSourceLocation( } } -void FormattedStackTracePrinter::RenderModuleLocation( - InternalScopedString *buffer, const char *module, uptr offset, - ModuleArch arch, const char *strip_path_prefix) { +void StackTracePrinter::RenderModuleLocation(InternalScopedString *buffer, + const char *module, uptr offset, + ModuleArch arch, + const char *strip_path_prefix) { buffer->AppendF("(%s", StripPathPrefix(module, strip_path_prefix)); if (arch != kModuleArchUnknown) { buffer->AppendF(":%s", ModuleArchToString(arch)); diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.h b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.h index 3e02333a8c8d5..9cf39013e78bc 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.h @@ -25,7 +25,8 @@ class StackTracePrinter { public: static StackTracePrinter *GetOrInit(); - virtual const char *StripFunctionName(const char *function) = 0; + // Strip interceptor prefixes from function name. + const char *StripFunctionName(const char *function); virtual void RenderFrame(InternalScopedString *buffer, const char *format, int frame_no, uptr address, const AddressInfo *info, @@ -34,15 +35,13 @@ class StackTracePrinter { virtual bool RenderNeedsSymbolization(const char *format) = 0; - virtual void RenderSourceLocation(InternalScopedString *buffer, - const char *file, int line, int column, - bool vs_style, - const char *strip_path_prefix) = 0; + void RenderSourceLocation(InternalScopedString *buffer, const char *file, + int line, int column, bool vs_style, + const char *strip_path_prefix); - virtual void RenderModuleLocation(InternalScopedString *buffer, - const char *module, uptr offset, - ModuleArch arch, - const char *strip_path_prefix) = 0; + void RenderModuleLocation(InternalScopedString *buffer, const char *module, + uptr offset, ModuleArch arch, + const char *strip_path_prefix); virtual void RenderData(InternalScopedString *buffer, const char *format, const DataInfo *DI, const char *strip_path_prefix = "") = 0; @@ -53,9 +52,6 @@ class StackTracePrinter { class FormattedStackTracePrinter : public StackTracePrinter { public: - // Strip interceptor prefixes from function name. - const char *StripFunctionName(const char *function) override; - // Render the contents of "info" structure, which represents the contents of // stack frame "frame_no" and appends it to the "buffer". "format" is a // string with placeholders, which is copied to the output with @@ -90,14 +86,6 @@ class FormattedStackTracePrinter : public StackTracePrinter { bool RenderNeedsSymbolization(const char *format) override; - void RenderSourceLocation(InternalScopedString *buffer, const char *file, - int line, int column, bool vs_style, - const char *strip_path_prefix) override; - - void RenderModuleLocation(InternalScopedString *buffer, const char *module, - uptr offset, ModuleArch arch, - const char *strip_path_prefix) override; - // Same as RenderFrame, but for data section (global variables). // Accepts %s, %l from above. // Also accepts: