[PATCH] D36029: [sanitizer_common] Disable filesystem-related code for Fuchsia

[Roland McGrath via Phabricator via llvm-commits]

mcgrathr updated this revision to Diff 109168.
mcgrathr added a comment.

The SupportsColor change here is to avoid using report_file, so I think it belongs in this change.

This is rebased and ready to land after https://reviews.llvm.org/D36028 lands.
Please land it for me!

Thanks,
Roland


https://reviews.llvm.org/D36029

Files:
  lib/sanitizer_common/sanitizer_common_libcdep.cc
  lib/sanitizer_common/sanitizer_file.cc
  lib/sanitizer_common/sanitizer_suppressions.cc


Index: lib/sanitizer_common/sanitizer_suppressions.cc
===================================================================
--- lib/sanitizer_common/sanitizer_suppressions.cc
+++ lib/sanitizer_common/sanitizer_suppressions.cc
@@ -51,14 +51,16 @@
   if (filename[0] == '\0')
     return;
 
+#if !SANITIZER_FUCHSIA
   // If we cannot find the file, check if its location is relative to
   // the location of the executable.
   InternalScopedString new_file_path(kMaxPathLength);
   if (!FileExists(filename) && !IsAbsolutePath(filename) &&
       GetPathAssumingFileIsRelativeToExec(filename, new_file_path.data(),
                                           new_file_path.size())) {
     filename = new_file_path.data();
   }
+#endif // !SANITIZER_FUCHSIA
 
   // Read the file.
   VPrintf(1, "%s: reading suppressions file at %s\n",
Index: lib/sanitizer_common/sanitizer_file.cc
===================================================================
--- lib/sanitizer_common/sanitizer_file.cc
+++ lib/sanitizer_common/sanitizer_file.cc
@@ -14,6 +14,10 @@
 //
 //===---------------------------------------------------------------------===//
 
+#include "sanitizer_platform.h"
+
+#if !SANITIZER_FUCHSIA
+
 #include "sanitizer_common.h"
 #include "sanitizer_file.h"
 
@@ -169,3 +173,5 @@
   report_file.fd_pid = internal_getpid();
 }
 } // extern "C"
+
+#endif // !SANITIZER_FUCHSIA
Index: lib/sanitizer_common/sanitizer_common_libcdep.cc
===================================================================
--- lib/sanitizer_common/sanitizer_common_libcdep.cc
+++ lib/sanitizer_common/sanitizer_common_libcdep.cc
@@ -26,21 +26,36 @@
 
 namespace __sanitizer {
 
+#if !SANITIZER_FUCHSIA
+
 bool ReportFile::SupportsColors() {
   SpinMutexLock l(mu);
   ReopenIfNecessary();
   return SupportsColoredOutput(fd);
 }
 
+static INLINE bool ReportSupportsColors() {
+  return report_file.SupportsColors();
+}
+
+#else // SANITIZER_FUCHSIA
+
+// Fuchsia's logs always go through post-processing that handles colorization.
+static INLINE bool ReportSupportsColors() {
+  return true;
+}
+
+#endif // !SANITIZER_FUCHSIA
+
 bool ColorizeReports() {
   // FIXME: Add proper Windows support to AnsiColorDecorator and re-enable color
   // printing on Windows.
   if (SANITIZER_WINDOWS)
     return false;
 
   const char *flag = common_flags()->color;
   return internal_strcmp(flag, "always") == 0 ||
-         (internal_strcmp(flag, "auto") == 0 && report_file.SupportsColors());
+         (internal_strcmp(flag, "auto") == 0 && ReportSupportsColors());
 }
 
 static void (*sandboxing_callback)();


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D36029.109168.patch
Type: text/x-patch
Size: 2579 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170801/8aa14c0d/attachment.bin>