Author: phosek Date: Thu Jul 20 18:17:49 2017 New Revision: 308707 URL: http://llvm.org/viewvc/llvm-project?rev=308707&view=rev Log: [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 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=308707&r1=308706&r2=308707&view=diff ============================================================================== --- cfe/trunk/lib/Driver/SanitizerArgs.cpp (original) +++ cfe/trunk/lib/Driver/SanitizerArgs.cpp Thu Jul 20 18:17:49 2017 @@ -504,7 +504,7 @@ SanitizerArgs::SanitizerArgs(const ToolC // 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; Modified: cfe/trunk/test/Driver/fsanitize-coverage.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/fsanitize-coverage.c?rev=308707&r1=308706&r2=308707&view=diff ============================================================================== --- cfe/trunk/test/Driver/fsanitize-coverage.c (original) +++ cfe/trunk/test/Driver/fsanitize-coverage.c Thu Jul 20 18:17:49 2017 @@ -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 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
