Skip to content

Commit

Permalink
[sanitizer_common] Disable filesystem-related code for Fuchsia
Browse files Browse the repository at this point in the history
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
  • Loading branch information
vitalybuka committed Aug 1, 2017
1 parent 50692a2 commit 51ca757
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
15 changes: 14 additions & 1 deletion compiler-rt/lib/sanitizer_common/sanitizer_common_libcdep.cc
Expand Up @@ -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.
Expand All @@ -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)();
Expand Down
6 changes: 6 additions & 0 deletions compiler-rt/lib/sanitizer_common/sanitizer_file.cc
Expand Up @@ -14,6 +14,10 @@
//
//===---------------------------------------------------------------------===//

#include "sanitizer_platform.h"

#if !SANITIZER_FUCHSIA

#include "sanitizer_common.h"
#include "sanitizer_file.h"

Expand Down Expand Up @@ -169,3 +173,5 @@ void __sanitizer_set_report_fd(void *fd) {
report_file.fd_pid = internal_getpid();
}
} // extern "C"

#endif // !SANITIZER_FUCHSIA
2 changes: 2 additions & 0 deletions compiler-rt/lib/sanitizer_common/sanitizer_suppressions.cc
Expand Up @@ -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);
Expand All @@ -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",
Expand Down

0 comments on commit 51ca757

Please sign in to comment.