diff options
| author | Petr Hosek <phosek@chromium.org> | 2018-02-27 00:01:26 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2018-02-27 00:01:26 +0000 |
| commit | a459dab937ffdce9dc2c2dff1d93c678da7141cd (patch) | |
| tree | e52460ef5cc2a2fd66e29c0c85d2651d64a7a864 | |
| parent | d2af423bbef9840ca983ac72360579e89ccb0e3a (diff) | |
| download | bcm5719-llvm-a459dab937ffdce9dc2c2dff1d93c678da7141cd.tar.gz bcm5719-llvm-a459dab937ffdce9dc2c2dff1d93c678da7141cd.zip | |
[Driver] Add SafeStack to a map of incompatible sanitizers
This allows reporting an error when user tries to use SafeStack with
incompatible sanitizers.
Differential Revision: https://reviews.llvm.org/D43606
llvm-svn: 326151
| -rw-r--r-- | clang/lib/Driver/SanitizerArgs.cpp | 4 | ||||
| -rw-r--r-- | clang/test/Driver/fsanitize.c | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/clang/lib/Driver/SanitizerArgs.cpp b/clang/lib/Driver/SanitizerArgs.cpp index fda91890642..06e04b17ba7 100644 --- a/clang/lib/Driver/SanitizerArgs.cpp +++ b/clang/lib/Driver/SanitizerArgs.cpp @@ -378,7 +378,9 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC, std::make_pair(Efficiency, Address | HWAddress | Leak | Thread | Memory | KernelAddress), std::make_pair(Scudo, Address | HWAddress | Leak | Thread | Memory | - KernelAddress | Efficiency)}; + KernelAddress | Efficiency), + std::make_pair(SafeStack, Address | HWAddress | Leak | Thread | Memory | + KernelAddress | Efficiency)}; for (auto G : IncompatibleGroups) { SanitizerMask Group = G.first; if (Kinds & Group) { diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c index b5a677530a9..a13d0b8e1ed 100644 --- a/clang/test/Driver/fsanitize.c +++ b/clang/test/Driver/fsanitize.c @@ -526,7 +526,7 @@ // NOSP-NOT: "-fsanitize=safe-stack" // RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP -// RUN: %clang -target x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP-ASAN +// RUN: %clang -target x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN // RUN: %clang -target x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP // RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP // RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP @@ -534,14 +534,11 @@ // RUN: %clang -target i386-contiki-unknown -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP // NO-SP-NOT: stack-protector // NO-SP: "-fsanitize=safe-stack" +// SP-ASAN: error: invalid argument '-fsanitize=safe-stack' not allowed with '-fsanitize=address' // SP: "-fsanitize=safe-stack" // SP: -stack-protector // NO-SP-NOT: stack-protector -// NO-SP-ASAN-NOT: stack-protector -// NO-SP-ASAN: "-fsanitize=address,safe-stack" -// NO-SP-ASAN-NOT: stack-protector - // RUN: %clang -target powerpc64-unknown-linux-gnu -fsanitize=memory %s -### 2>&1 | FileCheck %s -check-prefix=CHECK-SANM // RUN: %clang -target powerpc64le-unknown-linux-gnu -fsanitize=memory %s -### 2>&1 | FileCheck %s -check-prefix=CHECK-SANM // CHECK-SANM: "-fsanitize=memory" |
