This is an archive of the discontinued LLVM Phabricator instance.

Differential D54330

Driver: Make -fsanitize=shadow-call-stack compatible with -fsanitize-minimal-runtime.
ClosedPublic

Authored by pcc on Nov 9 2018, 9:47 AM.

Details

Reviewers
eugenis
Commits
rGc97638556b1a: Driver: Make -fsanitize=shadow-call-stack compatible with -fsanitize-minimal…
rC346526: Driver: Make -fsanitize=shadow-call-stack compatible with -fsanitize-minimal…
rL346526: Driver: Make -fsanitize=shadow-call-stack compatible with -fsanitize-minimal…

Diff Detail

Event Timeline

pcc created this revision.Nov 9 2018, 9:47 AM
Herald added subscribers: llvm-commits, cryptoad. · View Herald TranscriptNov 9 2018, 9:47 AM
Harbormaster completed remote builds in B24796: Diff 173367.Nov 9 2018, 9:47 AM
eugenis accepted this revision.Nov 9 2018, 9:54 AM

LGTM

This revision is now accepted and ready to land.Nov 9 2018, 9:54 AM
Closed by commit rL346526: Driver: Make -fsanitize=shadow-call-stack compatible with -fsanitize-minimal… (authored by pcc). · Explain WhyNov 9 2018, 9:57 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang/
lib/
Driver/
2 lines
test/
Driver/
4 lines

Diff 173367

clang/lib/Driver/SanitizerArgs.cpp

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Linesenum : SanitizerMask {
AlwaysRecoverable = KernelAddress | KernelHWAddress, AlwaysRecoverable = KernelAddress | KernelHWAddress,
LegacyFsanitizeRecoverMask = Undefined | Integer, LegacyFsanitizeRecoverMask = Undefined | Integer,
NeedsLTO = CFI, NeedsLTO = CFI,
TrappingSupported = (Undefined & ~Vptr) | UnsignedIntegerOverflow | TrappingSupported = (Undefined & ~Vptr) | UnsignedIntegerOverflow |
ImplicitConversion | Nullability | LocalBounds | CFI, ImplicitConversion | Nullability | LocalBounds | CFI,
TrappingDefault = CFI, TrappingDefault = CFI,
CFIClasses = CFIClasses =
CFIVCall | CFINVCall | CFIMFCall | CFIDerivedCast | CFIUnrelatedCast, CFIVCall | CFINVCall | CFIMFCall | CFIDerivedCast | CFIUnrelatedCast,
CompatibleWithMinimalRuntime = TrappingSupported | Scudo, CompatibleWithMinimalRuntime = TrappingSupported | Scudo | ShadowCallStack,
}; };
enum CoverageFeature { enum CoverageFeature {
CoverageFunc = 1 << 0, CoverageFunc = 1 << 0,
CoverageBB = 1 << 1, CoverageBB = 1 << 1,
CoverageEdge = 1 << 2, CoverageEdge = 1 << 2,
CoverageIndirCall = 1 << 3, CoverageIndirCall = 1 << 3,
CoverageTraceBB = 1 << 4, // Deprecated. CoverageTraceBB = 1 << 4, // Deprecated.
▲ Show 20 Lines • Show All 973 Lines • Show Last 20 Lines

clang/test/Driver/fsanitize.c

Show First 20 Lines • Show All 761 Lines • ▼ Show 20 Lines
// RUN: %clang -target x86_64-linux-gnu -fsanitize=cfi -fno-sanitize-trap=cfi-icall -flto -fvisibility=hidden -fsanitize-minimal-runtime %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-CFI-NOTRAP-MINIMAL // RUN: %clang -target x86_64-linux-gnu -fsanitize=cfi -fno-sanitize-trap=cfi-icall -flto -fvisibility=hidden -fsanitize-minimal-runtime %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-CFI-NOTRAP-MINIMAL
// CHECK-CFI-NOTRAP-MINIMAL: error: invalid argument 'fsanitize-minimal-runtime' only allowed with 'fsanitize-trap=cfi' // CHECK-CFI-NOTRAP-MINIMAL: error: invalid argument 'fsanitize-minimal-runtime' only allowed with 'fsanitize-trap=cfi'
// RUN: %clang -target x86_64-linux-gnu -fsanitize=cfi -fno-sanitize-trap=cfi-icall -fno-sanitize=cfi-icall -flto -fvisibility=hidden -fsanitize-minimal-runtime %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-CFI-NOICALL-MINIMAL // RUN: %clang -target x86_64-linux-gnu -fsanitize=cfi -fno-sanitize-trap=cfi-icall -fno-sanitize=cfi-icall -flto -fvisibility=hidden -fsanitize-minimal-runtime %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-CFI-NOICALL-MINIMAL
// CHECK-CFI-NOICALL-MINIMAL: "-fsanitize=cfi-derived-cast,cfi-mfcall,cfi-unrelated-cast,cfi-nvcall,cfi-vcall" // CHECK-CFI-NOICALL-MINIMAL: "-fsanitize=cfi-derived-cast,cfi-mfcall,cfi-unrelated-cast,cfi-nvcall,cfi-vcall"
// CHECK-CFI-NOICALL-MINIMAL: "-fsanitize-trap=cfi-derived-cast,cfi-mfcall,cfi-unrelated-cast,cfi-nvcall,cfi-vcall" // 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" // 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 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 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 // RUN: %clang -target x86_64-linux-gnu -fsanitize=scudo %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SCUDO
// RUN: %clang -target i386-linux-gnu -fsanitize=scudo %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SCUDO // RUN: %clang -target i386-linux-gnu -fsanitize=scudo %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SCUDO
// RUN: %clang -target mips64-unknown-linux-gnu -fsanitize=scudo %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SCUDO // RUN: %clang -target mips64-unknown-linux-gnu -fsanitize=scudo %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SCUDO
// RUN: %clang -target mips64el-unknown-linux-gnu -fsanitize=scudo %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SCUDO // RUN: %clang -target mips64el-unknown-linux-gnu -fsanitize=scudo %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SCUDO
// RUN: %clang -target mips-unknown-linux-gnu -fsanitize=scudo %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SCUDO // RUN: %clang -target mips-unknown-linux-gnu -fsanitize=scudo %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SCUDO
// RUN: %clang -target mipsel-unknown-linux-gnu -fsanitize=scudo %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SCUDO // RUN: %clang -target mipsel-unknown-linux-gnu -fsanitize=scudo %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SCUDO
Show All 36 Lines