diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2018-11-09 17:54:49 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2018-11-09 17:54:49 +0000 |
| commit | c97638556b1af7ef490bd3863f86d002afadb7e1 (patch) | |
| tree | cd19ef32e8222bb53f7015949f2fa36647fdb0ae | |
| parent | 69cf5571e383b0b3d83bc4834f2c09b3e89dfd4a (diff) | |
| download | bcm5719-llvm-c97638556b1af7ef490bd3863f86d002afadb7e1.tar.gz bcm5719-llvm-c97638556b1af7ef490bd3863f86d002afadb7e1.zip | |
Driver: Make -fsanitize=shadow-call-stack compatible with -fsanitize-minimal-runtime.
Differential Revision: https://reviews.llvm.org/D54330
llvm-svn: 346526
| -rw-r--r-- | clang/lib/Driver/SanitizerArgs.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Driver/fsanitize.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/clang/lib/Driver/SanitizerArgs.cpp b/clang/lib/Driver/SanitizerArgs.cpp index 03000544641..135adb519bd 100644 --- a/clang/lib/Driver/SanitizerArgs.cpp +++ b/clang/lib/Driver/SanitizerArgs.cpp @@ -47,7 +47,7 @@ enum : SanitizerMask { TrappingDefault = CFI, CFIClasses = CFIVCall | CFINVCall | CFIMFCall | CFIDerivedCast | CFIUnrelatedCast, - CompatibleWithMinimalRuntime = TrappingSupported | Scudo, + CompatibleWithMinimalRuntime = TrappingSupported | Scudo | ShadowCallStack, }; enum CoverageFeature { diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c index dd282d2b08f..aeb0130e8cb 100644 --- a/clang/test/Driver/fsanitize.c +++ b/clang/test/Driver/fsanitize.c @@ -767,6 +767,10 @@ // CHECK-CFI-NOICALL-MINIMAL: "-fsanitize-trap=cfi-derived-cast,cfi-mfcall,cfi-unrelated-cast,cfi-nvcall,cfi-vcall" // CHECK-CFI-NOICALL-MINIMAL: "-fsanitize-minimal-runtime" +// RUN: %clang -target x86_64-linux-gnu -fsanitize=shadow-call-stack -fsanitize-minimal-runtime %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SCS-MINIMAL +// CHECK-SCS-MINIMAL: "-fsanitize=shadow-call-stack" +// CHECK-SCS-MINIMAL: "-fsanitize-minimal-runtime" + // RUN: %clang -target aarch64-linux-gnu -fsanitize=scudo %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SCUDO // RUN: %clang -target arm-linux-androideabi -fsanitize=scudo %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SCUDO // RUN: %clang -target x86_64-linux-gnu -fsanitize=scudo %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SCUDO |
