diff options
| author | Vitaly Buka <vitalybuka@google.com> | 2017-08-01 21:28:39 +0000 | 
|---|---|---|
| committer | Vitaly Buka <vitalybuka@google.com> | 2017-08-01 21:28:39 +0000 | 
| commit | 51ca757e610b326153f99102d2659d3a141473e1 (patch) | |
| tree | 50314d0784cdcdfe645ed1951fda2b8d2d3ffbdd /compiler-rt/lib | |
| parent | 50692a203c98cf4116a2e924cad498cae2a35e09 (diff) | |
| download | bcm5719-llvm-51ca757e610b326153f99102d2659d3a141473e1.tar.gz bcm5719-llvm-51ca757e610b326153f99102d2659d3a141473e1.zip  | |
[sanitizer_common] Disable filesystem-related code for Fuchsia
Summary:
Fuchsia doesn't support filesystem access per se at low level.
So it won't use any of the filesystem-oriented code in sanitizer_common.
Submitted on behalf of Roland McGrath.
Reviewers: vitalybuka, alekseyshl, kcc
Reviewed By: vitalybuka
Subscribers: kubamracek, phosek, filcab, llvm-commits
Tags: #sanitizers
Differential Revision: https://reviews.llvm.org/D36029
llvm-svn: 309749
Diffstat (limited to 'compiler-rt/lib')
3 files changed, 22 insertions, 1 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_libcdep.cc b/compiler-rt/lib/sanitizer_common/sanitizer_common_libcdep.cc index 82d223a29f3..b54503a6d88 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_common_libcdep.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_libcdep.cc @@ -26,12 +26,25 @@  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. @@ -40,7 +53,7 @@ bool ColorizeReports() {    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)(); diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_file.cc b/compiler-rt/lib/sanitizer_common/sanitizer_file.cc index dfbe99c5660..cde54bfde80 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_file.cc +++ b/compiler-rt/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 @@ void __sanitizer_set_report_fd(void *fd) {    report_file.fd_pid = internal_getpid();  }  } // extern "C" + +#endif  // !SANITIZER_FUCHSIA diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_suppressions.cc b/compiler-rt/lib/sanitizer_common/sanitizer_suppressions.cc index d9e26b8fca9..89ddfddd110 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_suppressions.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_suppressions.cc @@ -51,6 +51,7 @@ void SuppressionContext::ParseFromFile(const char *filename) {    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); @@ -59,6 +60,7 @@ void SuppressionContext::ParseFromFile(const char *filename) {                                            new_file_path.size())) {      filename = new_file_path.data();    } +#endif  // !SANITIZER_FUCHSIA    // Read the file.    VPrintf(1, "%s: reading suppressions file at %s\n",  | 

