Author: phosek Date: Sun Aug 4 21:48:56 2019 New Revision: 367799 URL: http://llvm.org/viewvc/llvm-project?rev=367799&view=rev Log: [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 Modified: cfe/trunk/lib/Driver/SanitizerArgs.cpp cfe/trunk/test/Driver/fsanitize-coverage.c Modified: cfe/trunk/lib/Driver/SanitizerArgs.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/SanitizerArgs.cpp?rev=367799&r1=367798&r2=367799&view=diff ============================================================================== --- cfe/trunk/lib/Driver/SanitizerArgs.cpp (original) +++ cfe/trunk/lib/Driver/SanitizerArgs.cpp Sun Aug 4 21:48:56 2019 @@ -46,7 +46,8 @@ static const SanitizerMask SupportsCover 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 | Modified: cfe/trunk/test/Driver/fsanitize-coverage.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/fsanitize-coverage.c?rev=367799&r1=367798&r2=367799&view=diff ============================================================================== --- cfe/trunk/test/Driver/fsanitize-coverage.c (original) +++ cfe/trunk/test/Driver/fsanitize-coverage.c Sun Aug 4 21:48:56 2019 @@ -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 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
