diff options
author | Kostya Serebryany <kcc@google.com> | 2014-12-03 23:27:45 +0000 |
---|---|---|
committer | Kostya Serebryany <kcc@google.com> | 2014-12-03 23:27:45 +0000 |
commit | bed8da2e3b6505375155e6ae9568d912cdb223d1 (patch) | |
tree | aad1426dc7b41b7a026171f4aa99d31f796bbeb8 | |
parent | 0c7dc9f7c331a82b4d6162280bebab2da2ebc2ae (diff) | |
download | bcm5719-llvm-bed8da2e3b6505375155e6ae9568d912cdb223d1.tar.gz bcm5719-llvm-bed8da2e3b6505375155e6ae9568d912cdb223d1.zip |
[msan] allow -fsanitize-coverage=N together with -fsanitize=memory, clang part
llvm-svn: 223311
-rw-r--r-- | clang/lib/Driver/SanitizerArgs.cpp | 2 | ||||
-rw-r--r-- | clang/test/Driver/fsanitize.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Driver/SanitizerArgs.cpp b/clang/lib/Driver/SanitizerArgs.cpp index 1e7487f7690..4d288f75e5a 100644 --- a/clang/lib/Driver/SanitizerArgs.cpp +++ b/clang/lib/Driver/SanitizerArgs.cpp @@ -298,7 +298,7 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC, } // Parse -fsanitize-coverage=N - if (NeedsAsan) { // Currently asan is required. + if (NeedsAsan || NeedsMsan) { // Currently asan or msan is required. if (Arg *A = Args.getLastArg(options::OPT_fsanitize_coverage)) { StringRef S = A->getValue(); // Legal values are 0..4. diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c index e8e91dc947e..45f8ff0daa1 100644 --- a/clang/test/Driver/fsanitize.c +++ b/clang/test/Driver/fsanitize.c @@ -84,6 +84,7 @@ // RUN: %clang -target x86_64-linux-gnu -fsanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-COVERAGE-0 // CHECK-SANITIZE-COVERAGE-0-NOT: fsanitize-coverage // RUN: %clang -target x86_64-linux-gnu -fsanitize=address -fsanitize-coverage=1 %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-COVERAGE-1 +// RUN: %clang -target x86_64-linux-gnu -fsanitize=memory -fsanitize-coverage=1 %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-COVERAGE-1 // CHECK-SANITIZE-COVERAGE-1: fsanitize-coverage=1 // RUN: %clang -target x86_64-linux-gnu -fsanitize=address -fsanitize-coverage=4 %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-COVERAGE-4 // CHECK-SANITIZE-COVERAGE-4: fsanitize-coverage=4 |