[compiler-rt] [sanitizer_symbolizer] Add initial symbolizer markup (PR #72605)
via llvm-commits
llvm-commits at lists.llvm.org
Thu Nov 16 19:20:16 PST 2023
=?utf-8?q?Andrés?= Villegas <andresvi at google.com>
Message-ID:
In-Reply-To: <llvm.org/llvm/llvm-project/pull/72605 at github.com>
github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code. :warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff b034da7dad150a54661557cc3f712948b1e474e4 c5b1fab5201a48956654b7633273e7a0fc71abf6 -- compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.h compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_fuchsia.cpp compiler-rt/test/asan/TestCases/use-after-free-symbolizer-markup.cpp compiler-rt/test/hwasan/TestCases/use-after-free-symbolizer-markup.c compiler-rt/lib/sanitizer_common/sanitizer_platform.h compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.cpp compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.h compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.h compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cpp compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_report_fuchsia.cpp
``````````
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.cpp
index 7a3e4827a7..5b78af616e 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.cpp
@@ -19,7 +19,6 @@
namespace __sanitizer {
-
const char *StackTracePrinter::StripFunctionName(const char *function) {
if (!common_flags()->demangle)
return function;
@@ -330,9 +329,10 @@ void FormattedStackTracePrinter::RenderData(InternalScopedString *buffer,
#endif // !SANITIZER_SYMBOLIZER_MARKUP_FUCHSIA
-void StackTracePrinter::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)
@@ -349,9 +349,10 @@ void StackTracePrinter::RenderSourceLocation(
}
}
-void StackTracePrinter::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 a3d2307e87..5d2e01c0c9 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_printer.h
@@ -12,9 +12,9 @@
#ifndef SANITIZER_STACKTRACE_PRINTER_H
#define SANITIZER_STACKTRACE_PRINTER_H
-#include "sanitizer_platform.h"
#include "sanitizer_common.h"
#include "sanitizer_internal_defs.h"
+#include "sanitizer_platform.h"
#include "sanitizer_symbolizer.h"
namespace __sanitizer {
@@ -29,15 +29,13 @@ class StackTracePrinter {
// Strip interceptor prefixes from function name.
const char *StripFunctionName(const char *function);
- void RenderSourceLocation(InternalScopedString *buffer,
- const char *file, int line, int column,
- bool vs_style,
- const char *strip_path_prefix);
+ void RenderSourceLocation(InternalScopedString *buffer, const char *file,
+ int line, int column, bool vs_style,
+ const char *strip_path_prefix);
- void RenderModuleLocation(InternalScopedString *buffer,
- const char *module, uptr offset,
- ModuleArch arch,
- const char *strip_path_prefix);
+ void RenderModuleLocation(InternalScopedString *buffer, const char *module,
+ uptr offset, ModuleArch arch,
+ const char *strip_path_prefix);
virtual void RenderFrame(InternalScopedString *buffer, const char *format,
int frame_no, uptr address, const AddressInfo *info,
@@ -54,7 +52,6 @@ class StackTracePrinter {
~StackTracePrinter() {}
};
-
// See sanitizer_symbolizer_markup.h for the markup implementation of
// StackTracePrinter. This is code is omited for targets that opt in to
// use SymbolizerMarkup only.
@@ -108,7 +105,7 @@ class FormattedStackTracePrinter : public StackTracePrinter {
~FormattedStackTracePrinter() {}
};
-#endif // !SANITIZER_SYMBOLIZER_MARKUP_FUCHSIA
+#endif // !SANITIZER_SYMBOLIZER_MARKUP_FUCHSIA
} // namespace __sanitizer
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cpp
index b32ca05ead..42bc500da6 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cpp
@@ -192,8 +192,8 @@ void Symbolizer::RefreshModules() {
}
ListOfModules &Symbolizer::GetRefreshedListOfModules() {
- if(!modules_fresh_) {
- RefreshModules();
+ if (!modules_fresh_) {
+ RefreshModules();
}
CHECK(modules_fresh_);
return modules_;
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_fuchsia.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_fuchsia.cpp
index bb5401c478..5bf88e755d 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_fuchsia.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_fuchsia.cpp
@@ -13,12 +13,11 @@
#include "sanitizer_platform.h"
#if SANITIZER_SYMBOLIZER_MARKUP_FUCHSIA
-#include "sanitizer_symbolizer_markup.h"
-
-#include "sanitizer_common.h"
-#include "sanitizer_symbolizer.h"
-#include "sanitizer_stacktrace_printer.h"
-#include "sanitizer_symbolizer_markup_constants.h"
+# include "sanitizer_common.h"
+# include "sanitizer_stacktrace_printer.h"
+# include "sanitizer_symbolizer.h"
+# include "sanitizer_symbolizer_markup.h"
+# include "sanitizer_symbolizer_markup_constants.h"
namespace __sanitizer {
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
index 101803579d..54e6439a4a 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
@@ -476,11 +476,11 @@ static void ChooseSymbolizerTools(IntrusiveList<SymbolizerTool> *list,
VReport(2, "Symbolizer is disabled.\n");
return;
}
- if(common_flags()->enable_symbolizer_markup) {
- VReport(2, "Symbolizer markup enabled.\n");
- SymbolizerTool *tool = new(*allocator) MarkupSymbolizerTool();
- list->push_back(tool);
- return;
+ if (common_flags()->enable_symbolizer_markup) {
+ VReport(2, "Symbolizer markup enabled.\n");
+ SymbolizerTool *tool = new (*allocator) MarkupSymbolizerTool();
+ list->push_back(tool);
+ return;
}
if (IsAllocatorOutOfMemory()) {
VReport(2, "Cannot use internal symbolizer: out of memory\n");
diff --git a/compiler-rt/test/asan/TestCases/use-after-free-symbolizer-markup.cpp b/compiler-rt/test/asan/TestCases/use-after-free-symbolizer-markup.cpp
index 6e972c88f6..26ca796fdc 100644
--- a/compiler-rt/test/asan/TestCases/use-after-free-symbolizer-markup.cpp
+++ b/compiler-rt/test/asan/TestCases/use-after-free-symbolizer-markup.cpp
@@ -1,11 +1,11 @@
// Test that verifies that asan produces valid symbolizer markup when enabled.
-// RUN: %clangxx_asan -O1 %s -o %t
+// RUN: %clangxx_asan -O1 %s -o %t
// RUN: env ASAN_OPTIONS=enable_symbolizer_markup=1 not %run %t 2>&1 | FileCheck %s
// REQUIRES: linux
#include <stdlib.h>
int main() {
- char *x = (char*)malloc(10 * sizeof(char));
+ char *x = (char *)malloc(10 * sizeof(char));
free(x);
return x[5];
}
diff --git a/compiler-rt/test/hwasan/TestCases/use-after-free-symbolizer-markup.c b/compiler-rt/test/hwasan/TestCases/use-after-free-symbolizer-markup.c
index 39d1b1f96d..ba55db9a21 100644
--- a/compiler-rt/test/hwasan/TestCases/use-after-free-symbolizer-markup.c
+++ b/compiler-rt/test/hwasan/TestCases/use-after-free-symbolizer-markup.c
@@ -8,14 +8,13 @@
// RUN: %clang_hwasan -O3 %s -o %t
// RUN: env HWASAN_OPTIONS=enable_symbolizer_markup=1 not %run %t 2>&1 | FileCheck %s
-
-#include <stdlib.h>
-#include <stdio.h>
#include <sanitizer/hwasan_interface.h>
+#include <stdio.h>
+#include <stdlib.h>
int main() {
__hwasan_enable_allocator_tagging();
- char * volatile x = (char*)malloc(10);
+ char *volatile x = (char *)malloc(10);
free(x);
__hwasan_disable_allocator_tagging();
``````````
</details>
https://github.com/llvm/llvm-project/pull/72605
More information about the llvm-commits
mailing list