diff options
| author | Petr Hosek <phosek@chromium.org> | 2017-07-21 01:17:49 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2017-07-21 01:17:49 +0000 |
| commit | eb4127ffb5c4111954d04ea25a1cd9fbb18232dd (patch) | |
| tree | 2f5fa63e17b3e34d71f113506797f53dd8176fe1 | |
| parent | 8b591f592b667edcf96167c4475355e5d3b5769f (diff) | |
| download | bcm5719-llvm-eb4127ffb5c4111954d04ea25a1cd9fbb18232dd.tar.gz bcm5719-llvm-eb4127ffb5c4111954d04ea25a1cd9fbb18232dd.zip | |
[Driver] Consider -fno-sanitize=... state when filtering out -fsanitize-coverage=...
The driver ignores -fsanitize-coverage=... flags when also given
-fsanitize=... flags for sanitizer flavors that don't support the
coverage runtime. This logic failed to account for subsequent
-fno-sanitize=... flags that disable the sanitizer flavors that
conflict with -fsanitize-coverage=... flags.
Patch by Roland McGrath
Differential Revision: https://reviews.llvm.org/D35603
llvm-svn: 308707
| -rw-r--r-- | clang/lib/Driver/SanitizerArgs.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Driver/fsanitize-coverage.c | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/clang/lib/Driver/SanitizerArgs.cpp b/clang/lib/Driver/SanitizerArgs.cpp index 7a442c83e15..f11917439b8 100644 --- a/clang/lib/Driver/SanitizerArgs.cpp +++ b/clang/lib/Driver/SanitizerArgs.cpp @@ -504,7 +504,7 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC, // Disable coverage and not claim the flags if there is at least one // non-supporting sanitizer. - if (!(AllAddedKinds & ~setGroupBits(SupportsCoverage))) { + if (!(AllAddedKinds & ~AllRemove & ~setGroupBits(SupportsCoverage))) { Arg->claim(); } else { CoverageFeatures = 0; diff --git a/clang/test/Driver/fsanitize-coverage.c b/clang/test/Driver/fsanitize-coverage.c index b8a9fa60aa8..84d92b2adb6 100644 --- a/clang/test/Driver/fsanitize-coverage.c +++ b/clang/test/Driver/fsanitize-coverage.c @@ -95,3 +95,15 @@ // CLANG-CL-COVERAGE-NOT: unknown argument // CLANG-CL-COVERAGE: -fsanitize-coverage-type=1 // CLANG-CL-COVERAGE: -fsanitize=address + +// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -fsanitize-coverage=trace-pc-guard %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-VS-SAFESTACK +// CHECK-VS-SAFESTACK: -fsanitize=safe-stack +// CHECK-VS-SAFESTACK-NOT: -fsanitize-coverage-trace-pc-guard + +// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -fsanitize-coverage=trace-pc-guard -fno-sanitize=safe-stack %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-NO-SAFESTACK +// CHECK-NO-SAFESTACK-NOT: error: +// CHECK-NO-SAFESTACK-NOT: warning: +// CHECK-NO-SAFESTACK-NOT: argument unused +// CHECK-NO-SAFESTACK-NOT: unknown argument +// CHECK-NO-SAFESTACK-NOT: -fsanitize=safe-stack +// CHECK-NO-SAFESTACK: -fsanitize-coverage-trace-pc-guard |
