This is an archive of the discontinued LLVM Phabricator instance.

Differential D54735

Driver: SCS is compatible with every other sanitizer.
ClosedPublic

Authored by pcc on Nov 19 2018, 4:40 PM.

Details

Reviewers
eugenis
Commits
rGb5e19658a299: Driver: SCS is compatible with every other sanitizer.
rL347282: Driver: SCS is compatible with every other sanitizer.
rC347282: Driver: SCS is compatible with every other sanitizer.
Summary

Because SCS relies on system-provided runtime support, we can use it
together with any other sanitizer simply by linking the runtime for
the other sanitizer.

Diff Detail

Event Timeline

pcc created this revision.Nov 19 2018, 4:40 PM
Herald added a subscriber: llvm-commits. · View Herald TranscriptNov 19 2018, 4:40 PM
Harbormaster completed remote builds in B25168: Diff 174709.Nov 19 2018, 4:41 PM
eugenis accepted this revision.Nov 19 2018, 5:01 PM

LGTM

This revision is now accepted and ready to land.Nov 19 2018, 5:01 PM
Closed by commit rC347282: Driver: SCS is compatible with every other sanitizer. (authored by pcc). · Explain WhyNov 19 2018, 5:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

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

Diff 174709

clang/lib/Driver/SanitizerArgs.cpp

Show First 20 Lines • Show All 370 Lines • ▼ Show 20 Lines std::pair<SanitizerMask, SanitizerMask> IncompatibleGroups[] = {
std::make_pair(KernelAddress, Address | Leak | Thread | Memory), std::make_pair(KernelAddress, Address | Leak | Thread | Memory),
std::make_pair(HWAddress, Address | Thread | Memory | KernelAddress), std::make_pair(HWAddress, Address | Thread | Memory | KernelAddress),
std::make_pair(Efficiency, Address | HWAddress | Leak | Thread | Memory | std::make_pair(Efficiency, Address | HWAddress | Leak | Thread | Memory |
KernelAddress), KernelAddress),
std::make_pair(Scudo, Address | HWAddress | Leak | Thread | Memory | std::make_pair(Scudo, Address | HWAddress | Leak | Thread | Memory |
KernelAddress | Efficiency), KernelAddress | Efficiency),
std::make_pair(SafeStack, Address | HWAddress | Leak | Thread | Memory | std::make_pair(SafeStack, Address | HWAddress | Leak | Thread | Memory |
KernelAddress | Efficiency), KernelAddress | Efficiency),
std::make_pair(ShadowCallStack, Address | HWAddress | Leak | Thread |
Memory | KernelAddress | Efficiency |
SafeStack),
std::make_pair(KernelHWAddress, Address | HWAddress | Leak | Thread | std::make_pair(KernelHWAddress, Address | HWAddress | Leak | Thread |
Memory | KernelAddress | Efficiency | Memory | KernelAddress | Efficiency |
SafeStack | ShadowCallStack), SafeStack),
std::make_pair(KernelMemory, Address | HWAddress | Leak | Thread | std::make_pair(KernelMemory, Address | HWAddress | Leak | Thread |
Memory | KernelAddress | Efficiency | Memory | KernelAddress | Efficiency |
Scudo | SafeStack)}; Scudo | SafeStack)};
// Enable toolchain specific default sanitizers if not explicitly disabled. // Enable toolchain specific default sanitizers if not explicitly disabled.
SanitizerMask Default = TC.getDefaultSanitizers() & ~AllRemove; SanitizerMask Default = TC.getDefaultSanitizers() & ~AllRemove;
// Disable default sanitizers that are incompatible with explicitly requested // Disable default sanitizers that are incompatible with explicitly requested
// ones. // ones.
▲ Show 20 Lines • Show All 631 Lines • Show Last 20 Lines

clang/test/Driver/sanitizer-ld.c

Show First 20 Lines • Show All 582 Lines • ▼ Show 20 Lines
// RUN: %clang -fsanitize=shadow-call-stack %s -### -o %t.o 2>&1 \ // RUN: %clang -fsanitize=shadow-call-stack %s -### -o %t.o 2>&1 \
// RUN: -target x86-unknown-linux -fuse-ld=ld \ // RUN: -target x86-unknown-linux -fuse-ld=ld \
// RUN: | FileCheck --check-prefix=CHECK-SHADOWCALLSTACK-LINUX-X86 %s // RUN: | FileCheck --check-prefix=CHECK-SHADOWCALLSTACK-LINUX-X86 %s
// CHECK-SHADOWCALLSTACK-LINUX-X86: error: unsupported option '-fsanitize=shadow-call-stack' for target 'x86-unknown-linux' // CHECK-SHADOWCALLSTACK-LINUX-X86: error: unsupported option '-fsanitize=shadow-call-stack' for target 'x86-unknown-linux'
// RUN: %clang -fsanitize=shadow-call-stack %s -### -o %t.o 2>&1 \ // RUN: %clang -fsanitize=shadow-call-stack %s -### -o %t.o 2>&1 \
// RUN: -fsanitize=safe-stack -target x86_64-unknown-linux -fuse-ld=ld \ // RUN: -fsanitize=safe-stack -target x86_64-unknown-linux -fuse-ld=ld \
// RUN: | FileCheck --check-prefix=CHECK-SHADOWCALLSTACK-SAFESTACK %s // RUN: | FileCheck --check-prefix=CHECK-SHADOWCALLSTACK-SAFESTACK %s
// CHECK-SHADOWCALLSTACK-SAFESTACK: error: invalid argument '-fsanitize=shadow-call-stack' not allowed with '-fsanitize=safe-stack' // CHECK-SHADOWCALLSTACK-SAFESTACK-NOT: error:
// RUN: %clang -fsanitize=cfi -fsanitize-stats %s -### -o %t.o 2>&1 \ // RUN: %clang -fsanitize=cfi -fsanitize-stats %s -### -o %t.o 2>&1 \
// RUN: -target x86_64-unknown-linux -fuse-ld=ld \ // RUN: -target x86_64-unknown-linux -fuse-ld=ld \
// RUN: --sysroot=%S/Inputs/basic_linux_tree \ // RUN: --sysroot=%S/Inputs/basic_linux_tree \
// RUN: | FileCheck --check-prefix=CHECK-CFI-STATS-LINUX %s // RUN: | FileCheck --check-prefix=CHECK-CFI-STATS-LINUX %s
// CHECK-CFI-STATS-LINUX: "{{.*}}ld{{(.exe)?}}" // CHECK-CFI-STATS-LINUX: "{{.*}}ld{{(.exe)?}}"
// CHECK-CFI-STATS-LINUX: "--whole-archive" "{{[^"]*}}libclang_rt.stats_client-x86_64.a" "--no-whole-archive" // CHECK-CFI-STATS-LINUX: "--whole-archive" "{{[^"]*}}libclang_rt.stats_client-x86_64.a" "--no-whole-archive"
// CHECK-CFI-STATS-LINUX-NOT: "--whole-archive" // CHECK-CFI-STATS-LINUX-NOT: "--whole-archive"
▲ Show 20 Lines • Show All 244 Lines • Show Last 20 Lines