[compiler-rt] f775cb8 - [sanitizer] Fix Fuchsia bot failure

Teresa Johnson via llvm-commits llvm-commits at lists.llvm.org
Thu Oct 8 10:44:52 PDT 2020


Author: Teresa Johnson
Date: 2020-10-08T10:44:40-07:00
New Revision: f775cb8994ccb367d68cdea5ce453d747e47d891

URL: https://github.com/llvm/llvm-project/commit/f775cb8994ccb367d68cdea5ce453d747e47d891
DIFF: https://github.com/llvm/llvm-project/commit/f775cb8994ccb367d68cdea5ce453d747e47d891.diff

LOG: [sanitizer] Fix Fuchsia bot failure

Fixes bot failure from 4d5b1de40eccc7ffcfb859cef407e5f30bee77f8:
https://luci-milo.appspot.com/p/fuchsia/builders/ci/clang-linux-x64/b8867057367989385504

Updates the version of RenderFrame used by Fuchsia and adds a version of
the new RenderNeedsSymbolization.

Added: 
    

Modified: 
    compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp
index 2963af953609..30cba08ed539 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp
@@ -83,11 +83,14 @@ void RenderData(InternalScopedString *buffer, const char *format,
   buffer->append(kFormatData, DI->start);
 }
 
+bool RenderNeedsSymbolization(const char *format) { return false; }
+
 // We don't support the stack_trace_format flag at all.
 void RenderFrame(InternalScopedString *buffer, const char *format, int frame_no,
-                 const AddressInfo &info, bool vs_style,
+                 uptr address, const AddressInfo *info, bool vs_style,
                  const char *strip_path_prefix, const char *strip_func_prefix) {
-  buffer->append(kFormatFrame, frame_no, info.address);
+  CHECK(!RenderNeedsSymbolization(format));
+  buffer->append(kFormatFrame, frame_no, address);
 }
 
 Symbolizer *Symbolizer::PlatformInit() {


        


More information about the llvm-commits mailing list