diff options
| author | Petr Hosek <phosek@chromium.org> | 2019-08-05 04:48:56 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2019-08-05 04:48:56 +0000 |
| commit | 1e4f2792faf1c14a6cfdbac3c6101b5faec5fbac (patch) | |
| tree | 3a089353589418c7735e8339a5dbfa7b02f05d30 | |
| parent | 635f5ff580db8cb6e0b7ed4d6c16b849ef63bb11 (diff) | |
| download | bcm5719-llvm-1e4f2792faf1c14a6cfdbac3c6101b5faec5fbac.tar.gz bcm5719-llvm-1e4f2792faf1c14a6cfdbac3c6101b5faec5fbac.zip | |
[Driver] Don't disable -fsanitizer-coverage for safe-stack or shadow-call-stack
These "sanitizers" are hardened ABIs that are wholly orthogonal
to the SanitizerCoverage instrumentation.
Differential Revision: https://reviews.llvm.org/D65715
llvm-svn: 367799
| -rw-r--r-- | clang/lib/Driver/SanitizerArgs.cpp | 3 | ||||
| -rw-r--r-- | clang/test/Driver/fsanitize-coverage.c | 14 |
2 files changed, 15 insertions, 2 deletions
diff --git a/clang/lib/Driver/SanitizerArgs.cpp b/clang/lib/Driver/SanitizerArgs.cpp index baf3554b4b4..814e95200d9 100644 --- a/clang/lib/Driver/SanitizerArgs.cpp +++ b/clang/lib/Driver/SanitizerArgs.cpp @@ -46,7 +46,8 @@ static const SanitizerMask SupportsCoverage = SanitizerKind::Undefined | SanitizerKind::Integer | SanitizerKind::ImplicitConversion | SanitizerKind::Nullability | SanitizerKind::DataFlow | SanitizerKind::Fuzzer | - SanitizerKind::FuzzerNoLink | SanitizerKind::FloatDivideByZero; + SanitizerKind::FuzzerNoLink | SanitizerKind::FloatDivideByZero | + SanitizerKind::SafeStack | SanitizerKind::ShadowCallStack; static const SanitizerMask RecoverableByDefault = SanitizerKind::Undefined | SanitizerKind::Integer | SanitizerKind::ImplicitConversion | SanitizerKind::Nullability | diff --git a/clang/test/Driver/fsanitize-coverage.c b/clang/test/Driver/fsanitize-coverage.c index 20589e4b259..db669894d26 100644 --- a/clang/test/Driver/fsanitize-coverage.c +++ b/clang/test/Driver/fsanitize-coverage.c @@ -118,8 +118,8 @@ // 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-coverage-trace-pc-guard // 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: @@ -128,3 +128,15 @@ // CHECK-NO-SAFESTACK-NOT: unknown argument // CHECK-NO-SAFESTACK-NOT: -fsanitize=safe-stack // CHECK-NO-SAFESTACK: -fsanitize-coverage-trace-pc-guard + +// RUN: %clang -target x86_64-linux-gnu -fsanitize=shadow-call-stack -fsanitize-coverage=trace-pc-guard %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-VS-SHADOWCALLSTACK +// CHECK-VS-SHADOWCALLSTACK: -fsanitize-coverage-trace-pc-guard +// CHECK-VS-SHADOWCALLSTACK: -fsanitize=shadow-call-stack + +// RUN: %clang -target x86_64-linux-gnu -fsanitize=shadow-call-stack -fsanitize-coverage=trace-pc-guard -fno-sanitize=shadow-call-stack %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-NO-SAFESTACK +// CHECK-NO-SHADOWCALLSTACK-NOT: error: +// CHECK-NO-SHADOWCALLSTACK-NOT: warning: +// CHECK-NO-SHADOWCALLSTACK-NOT: argument unused +// CHECK-NO-SHADOWCALLSTACK-NOT: unknown argument +// CHECK-NO-SHADOWCALLSTACK-NOT: -fsanitize=shadow-call-stack +// CHECK-NO-SHADOWCALLSTACK: -fsanitize-coverage-trace-pc-guard |
